diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 5ce69e3..2abc150 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -167,10 +167,14 @@ bindkey -a '^[[3~' delete-char
 # always allow removing words with <c-w>
 bindkey -a '^w' backward-kill-word
 # enable cycling through previous commands with <c-p/n>
-bindkey '^P' up-line-or-history
-bindkey '^N' down-line-or-history
+bindkey '^P' history-beginning-search-backward
+bindkey '^N' history-beginning-search-forward
+
 # search history backwards <c-r>
 bindkey '^r' history-incremental-search-backward
+# cycle through history results
+bindkey -M isearch '^P' history-incremental-search-backward
+bindkey -M isearch '^N' history-incremental-search-forward
 
 # Send command to editor and back for execution
 zle -N edit-command-line