diff --git a/ChangeLog b/ChangeLog
index f9ac666a385b2ef2fb0f46db4d004f7111f57e8a..8ef02d077cd2802cf2092d51288dffa4a5a61f61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* prompt.c: Tentative fix for bug #23144: using arrow keys in 
+	  search buffer affects main window (by Mike Frysinger)
+
 2008-05-31 Chris Allegretta <chrisa@asty.org>
 	* global.c: Fix for Savannah bug #23442: left/right arrow keys 
 	  do not work with --enable-tiny (by Mike Frysinger)
diff --git a/src/search.c b/src/search.c
index cee7ac1f44c0f7b0aec27f4d017afd155781d7a0..f050e2b8aec14563bd271cd3db241fa52ab77ebf 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1383,7 +1383,7 @@ char *get_history_older(filestruct **h)
     assert(h != NULL);
 
     if ((*h)->prev == NULL)
-	return NULL;
+	return (*h)->data;
 
     *h = (*h)->prev;
 
@@ -1397,7 +1397,7 @@ char *get_history_newer(filestruct **h)
     assert(h != NULL);
 
     if ((*h)->next == NULL)
-	return NULL;
+	return (*h)->data;
 
     *h = (*h)->next;