diff --git a/src/ChangeLog b/src/ChangeLog
index 54a4d6a96..e0b1a12ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-04  Pavel Roskin  <proski@gnu.org>
+
+	* user.c (expand_format): Fixed processing of "%s".
+
 2000-09-30  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.in: Added an explicit rule for man2hlp.
diff --git a/src/user.c b/src/user.c
index 3fa6e02b2..1e4623732 100644
--- a/src/user.c
+++ b/src/user.c
@@ -208,8 +208,6 @@ char *expand_format (char c, int quote)
     case 'b': return strip_ext((*quote_func) (fname, 0));
     case 'x': return (*quote_func) (extension(fname), 0);
     case 'd': return (*quote_func) (panel->cwd, 0);
-    case 's': if (!panel->marked)
-		return (*quote_func) (fname, 0);
     case 'i': /* indent equal number cursor position in line */
         if (s_editwidget)
 	        return g_strnfill (s_editwidget->curs_col, ' ');
@@ -229,6 +227,8 @@ char *expand_format (char c, int quote)
 	if (menu)
 	    return (*quote_func) (menu, 0);
 	break;
+    case 's': if (!panel->marked)
+		return (*quote_func) (fname, 0);
 
 	/* Fall through */