diff --git a/common/content/modes.js b/common/content/modes.js
index 20b576da..90f5c2ee 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -158,7 +158,7 @@ const modes = (function () //{{{
             if (!options["showmode"])
                 return;
 
-            commandline.echo(getModeMessage(), "ModeMsg", commandline.DISALLOW_MULTILINE);
+            commandline.echo(getModeMessage(), "ModeMsg", commandline.FORCE_SINGLELINE);
         },
 
         // add/remove always work on the extended mode only
diff --git a/common/content/ui.js b/common/content/ui.js
index a2420b91..07eb4f34 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -999,7 +999,8 @@ function CommandLine() //{{{
                 let single = flags & (this.FORCE_SINGLELINE | this.DISALLOW_MULTILINE);
 
                 let action = echoLine;
-                if (!outputContainer.collapsed || messageBox.value == lastEcho)
+
+                if (!single && (!outputContainer.collapsed || messageBox.value == lastEcho))
                     action = echoMultiline;
 
                 if ((flags & this.FORCE_MULTILINE) || (/\n/.test(str) || typeof str == "xml") && !(flags & this.FORCE_SINGLELINE))