diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index 8d231e41c..8d3683c73 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -71,8 +71,8 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
 	bind $argv \ey yank-pop
 	bind $argv \ch backward-delete-char
 	bind $argv \cw backward-kill-word
-	bind $argv \cp history-search-backward
-	bind $argv \cn history-search-forward
+	bind $argv \cp up-or-search
+	bind $argv \cn down-or-search
 	bind $argv \cf forward-char
 	bind $argv \cb backward-char
 	bind $argv \ct transpose-chars