diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index 9aa64d6..c77e65c 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -326,4 +326,4 @@ else
   print "prezto: editor: invalid key bindings: $key_bindings" >&2
 fi
 
-unset key{,map,bindings}
+unset key{,map,_bindings}
diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh
index 67990a3..d3ee3a1 100644
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@@ -54,4 +54,6 @@ if [[ -n "$key_info" ]]; then
     bindkey -M "$keymap" "$key_info[Up]" history-substring-search-up
     bindkey -M "$keymap" "$key_info[Down]" history-substring-search-down
   done
+
+  unset keymap
 fi