diff --git a/ChangeLog b/ChangeLog
index 76b271e51d2b8c8d0318f0d9318b8201d711048f..118a22a1315ccf21dfe46883147d22af26305db2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,11 @@ CVS code -
   titlebar()
 	- Don't display overly long filenames with ellipses if the
 	  number of columns is extremely small. (DLR)
+	- Don't display any blank space for the state if we're in the
+	  file browser, as Pico doesn't. (DLR)
+	- Since path is always assumed to be NULL if DISABLE_BROWSER is
+	  defined, put the check for its being NULL in a DISABLE_BROWSER
+	  #define. (DLR)
 - doc/syntax/c.nanorc:
 	- Since .i and .ii are preprocessed C and C++ output, colorize
 	  them here. (Mike Frysinger)
diff --git a/src/winio.c b/src/winio.c
index b79e10793dcba38a1a61c3193a4bcde8d7979a7a..2d7b2cbd7df8c8e5733c832268657975423da86c 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1964,7 +1964,7 @@ void titlebar(const char *path)
 	 * buffer. */
     size_t statelen = 0;
 	/* The length of the state in columns, or the length of
-	 * "Modified" if the state is blank. */
+	 * "Modified" if the state is blank and path is NULL. */
     char *exppath = NULL;
 	/* The filename, expanded for display. */
     bool newfie = FALSE;
@@ -2010,7 +2010,11 @@ void titlebar(const char *path)
 	state = openfile->modified ? _("Modified") : ISSET(VIEW_MODE) ?
 		_("View") : "";
 
-    statelen = strlenpt((state[0] != '\0') ? state : _("Modified"));
+    statelen = strlenpt((state[0] == '\0'
+#ifndef DISABLE_BROWSER
+	&& path == NULL
+#endif
+	) ? _("Modified") : state);
 
     /* If possible, add a space before state. */
     if (space > 0 && statelen < space)
@@ -2038,7 +2042,9 @@ void titlebar(const char *path)
 
     /* If we're not in the file browser, path should be the current
      * filename. */
+#ifndef DISABLE_BROWSER
     if (path == NULL)
+#endif
 	path = openfile->filename;
 
     /* Account for the full lengths of the prefix and the state. */