diff --git a/dotfiles/profile b/dotfiles/profile
index 1126332..9f3c2e5 100644
--- a/dotfiles/profile
+++ b/dotfiles/profile
@@ -32,10 +32,6 @@ for p in "${EXTRA_PATHS[@]}" ; do
 done
 unset EXTRA_PATHS
 
-# Disable stty ctrl-s/ctrl-q behavior
-stty stop undef
-stty start undef
-
 # Setup GPG Agent
 GPG_AGENT_INFO_PATH=$HOME/.gnupg/gpg-agent-info-`hostname`
 if test -f $GPG_AGENT_INFO_PATH && kill -0 `cut -d: -f 2 $GPG_AGENT_INFO_PATH` 2>/dev/null ; then
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index e67a20e..5e17935 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -2,7 +2,7 @@ HISTFILE=~/.histfile
 HISTSIZE=1000
 SAVEHIST=1000
 setopt appendhistory autocd autopushd extendedglob nohup nomatch histignorespace histlexwords histverify cbases
-unsetopt beep
+unsetopt beep histbeep listbeep flowcontrol
 bindkey -e
 
 # Completion