diff --git a/ChangeLog b/ChangeLog
index da0f6df2471317fbdfaed1ad2182a7dbc3babcb1..43413023002a51ae1ca1ebc0e734a5d2cbf3dc6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ CVS code -
 	  truncated, and where file sizes could be too long. (DLR)
 	- For the ".." entry, display "(parent dir)" instead of "(dir)",
 	  as Pico does. (DLR)
+  findnextfile()
+	- Simplify the uses of tail(). (DLR)
 - doc/syntax/c.nanorc:
 	- Since .i and .ii are preprocessed C and C++ output, colorize
 	  them here. (Mike Frysinger)
diff --git a/src/browser.c b/src/browser.c
index df6a8c440a2b87de8dc3d2058f315e24ca7786e6..9fd52cedc6476aaddbb9a3cea80f6e92171fc3f5 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -742,17 +742,17 @@ bool findnextfile(bool no_sameline, size_t begin, const char *needle)
     size_t currselected = selected;
 	/* The location in the current file list of the match we
 	 * find. */
-    const char *rev_start = tail(filelist[currselected]), *found = NULL;
+    const char *filetail = tail(filelist[currselected]);
+    const char *rev_start = filetail, *found = NULL;
 
 #ifndef NANO_TINY
     if (ISSET(BACKWARDS_SEARCH))
-	rev_start += strlen(tail(filelist[currselected]));
+	rev_start += strlen(rev_start);
 #endif
 
     /* Look for needle in the current filename we're searching. */
     while (TRUE) {
-	found = strstrwrapper(tail(filelist[currselected]), needle,
-		rev_start);
+	found = strstrwrapper(filetail, needle, rev_start);
 
 	/* We've found a potential match.  If we're not allowed to find
 	 * a match on the same filename we started on and this potential
@@ -792,10 +792,12 @@ bool findnextfile(bool no_sameline, size_t begin, const char *needle)
 	if (currselected == begin)
 	    search_last_file = TRUE;
 
-	rev_start = tail(filelist[currselected]);
+	filetail = tail(filelist[currselected]);
+
+	rev_start = filetail;
 #ifndef NANO_TINY
 	if (ISSET(BACKWARDS_SEARCH))
-	    rev_start += strlen(tail(filelist[currselected]));
+	    rev_start += strlen(rev_start);
 #endif
     }