diff --git a/liberator/content/io.js b/liberator/content/io.js
index 9ff46105..25a67916 100644
--- a/liberator/content/io.js
+++ b/liberator/content/io.js
@@ -367,6 +367,7 @@ function IO() //{{{
             let output = io.system(args);
             let command = ":" + util.escapeHTML(commandline.getCommand()) + "<br/>";
 
+            liberator.echo(template.generic(<span style="white-space: pre">{output}</span>))
             liberator.echo(command + util.escapeHTML(output));
 
             autocommands.trigger("ShellCmdPost", {});
diff --git a/liberator/content/ui.js b/liberator/content/ui.js
index 1f23a21d..81d62148 100644
--- a/liberator/content/ui.js
+++ b/liberator/content/ui.js
@@ -376,7 +376,7 @@ function CommandLine() //{{{
          * after interpolated data.
          */
         XML.ignoreWhitespace = typeof str != "xml";
-        let output = util.xmlToDom(<div class={"ex-command-output "} highlight={highlightGroup}>{template.maybeXML(str)}</div>, doc);
+        let output = util.xmlToDom(<div class={"ex-command-output "} style="white-space: nowrap" highlight={highlightGroup}>{template.maybeXML(str)}</div>, doc);
         XML.ignoreWhitespace = true;
 
         lastMowOutput = output;