diff --git a/ChangeLog b/ChangeLog
index bbebfd92..79ff502a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@ CVS code -
 	- Added check for _POSIX_VDISABLE and use raw mode if not
 	  available, allows nano to work with cygwin.
 	- Added gettext calls to enable/disable strings (Jordi).
+- search.c:
+  findnextstr()
+	- Reset starting at current for search instead of begin.
 - es.po:
 	- Translated new strings and minor updates (Jordi).
 
diff --git a/search.c b/search.c
index 477b34fc..f6b63f7d 100644
--- a/search.c
+++ b/search.c
@@ -134,7 +134,7 @@ filestruct *findnextstr(int quiet, filestruct * begin, char *needle)
     char *searchstr, *found = NULL, *tmp;
     int past_editbot = 0;
 
-    fileptr = begin;
+    fileptr = current;
 
     searchstr = &current->data[current_x + 1];
     /* Look for searchstr until EOF */