diff --git a/bash/.bashrc b/bash/.bashrc
index f4c0c09..3a4de12 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -279,6 +279,7 @@ man() {
 }
 
 # Apply customizations
+stty -ixon # disable ctrl-s and ctrl-q
 bashrc_customize_environment
 bashrc_customize_shell_options
 bashrc_customize_paths
diff --git a/misc/.inputrc b/misc/.inputrc
index fb8b495..666ac8d 100644
--- a/misc/.inputrc
+++ b/misc/.inputrc
@@ -26,6 +26,3 @@ set visible-stats on
 # Restore this behavior from emacs mode
 "\C-l": clear-screen
 
-# Avoid issues with C-s
-"\C-f": forward-search-history
-