diff --git a/.bashrc b/.bashrc
index 92458b5..b3ab9d4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -4,6 +4,12 @@
 export EDITOR=vim
 #--------------------------------------------------------------------------------
 
+#--------------------------------------------------------------------------------
+# Make less use visual bell
+#--------------------------------------------------------------------------------
+export LESS="-qr"
+#--------------------------------------------------------------------------------
+
 #--------------------------------------------------------------------------------
 # Update the path with local overrides
 #--------------------------------------------------------------------------------
diff --git a/.inputrc b/.inputrc
index ac81a39..6c4eee4 100644
--- a/.inputrc
+++ b/.inputrc
@@ -1 +1,2 @@
-set bell-style none
+set bell-style visible
+set prefer-visible-bell
diff --git a/.vimrc b/.vimrc
index 37b3394..76eb361 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,9 @@
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
+" Disable bell
+set vb
+
 " Ensure vim knows about Go(lang)
 set rtp+=$GOROOT/misc/vim