diff --git a/zsh/zshrc b/zsh/zshrc
index f40faed..4aef1f8 100755
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -71,3 +71,22 @@ export PROMPT='%F{blue}(%n@%m)%f %~ %(!.#.$) '
 # +-----------------+
 source $DOTFILES/zsh/plugins/autosuggestions/zsh-autosuggestions.zsh
 
+# Better searching in command mode
+bindkey -M vicmd '?' history-incremental-search-backward
+bindkey -M vicmd '/' history-incremental-search-forward
+
+# Beginning search with arrow keys
+bindkey "^[OA" history-beginning-search-backward
+bindkey "^[OB" history-beginning-search-forward
+bindkey "^[[A" history-beginning-search-backward
+bindkey "^[[B" history-beginning-search-forward
+bindkey -M vicmd "k" history-beginning-search-backward
+bindkey -M vicmd "j" history-beginning-search-forward
+
+# Make Vi mode transitions faster (KEYTIMEOUT is in hundredths of a second)
+export KEYTIMEOUT=1
+
+bindkey "^R" history-incremental-search-backward
+bindkey "^S" history-incremental-search-forward
+
+test -f $ZDOTDIR/zshrc.local && . $ZDOTDIR/zshrc.local