diff --git a/ChangeLog b/ChangeLog
index ad475b0aa..4bc3bc4ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
 	* 31221: Completion/Unix/Command/_git: Handle zero defined aliases
 	better
 
+	* 31222: Functions/Zle/down-line-or-beginning-search,
+	Functions/Zle/up-line-or-beginning-search: Don't trigger
+	warn_create_global
+
 2013-04-04  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 31203: Completion/Unix/Command/.distfiles,
diff --git a/Functions/Zle/down-line-or-beginning-search b/Functions/Zle/down-line-or-beginning-search
index fbd2c3341..4c713f197 100644
--- a/Functions/Zle/down-line-or-beginning-search
+++ b/Functions/Zle/down-line-or-beginning-search
@@ -3,6 +3,8 @@
 
 emulate -L zsh
 
+typeset -g __searching __savecursor
+
 if [[ ${+NUMERIC} -eq 0 &&
     ( $LASTWIDGET = $__searching || $RBUFFER != *$'\n'* ) ]]
 then
diff --git a/Functions/Zle/up-line-or-beginning-search b/Functions/Zle/up-line-or-beginning-search
index 5348e7ad3..bdc39335a 100644
--- a/Functions/Zle/up-line-or-beginning-search
+++ b/Functions/Zle/up-line-or-beginning-search
@@ -3,6 +3,8 @@
 
 emulate -L zsh
 
+typeset -g __searching __savecursor
+
 if [[ $LBUFFER == *$'\n'* ]]; then
   zle .up-line-or-history
   __searching=''