diff --git a/content/template.js b/content/template.js
index e6b42d99..f1ce0707 100644
--- a/content/template.js
+++ b/content/template.js
@@ -112,12 +112,12 @@ const template = {
         if (str == "")
             return <>{str}</>;
 
-        XML.ignoreWhitespace = false;
         str = String(str).replace(" ", "\u00a0");
         let s = <></>;
         let start = 0;
         for (let [i, length] in iter)
         {
+            XML.ignoreWhitespace = false;
             s += <>{str.substring(start, i)}</>;
             s += <span class="hl-Filter">{str.substr(i, length)}</span>;
             start = i + length;
diff --git a/content/ui.js b/content/ui.js
index 8d711d45..251397e7 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -235,7 +235,7 @@ function CommandLine() //{{{
          */
         XML.ignoreWhitespace = typeof str == "xml";
         var output = <div class={"ex-command-output " + highlightGroup} style={"min-width: " + commandlineWidget.scrollWidth + "px"}>{template.maybeXML(str)}</div>;
-        XML.ignoreWhiteSpace = true;
+        XML.ignoreWhitespace = true;
 
         lastMowOutput = output;
 
@@ -1321,7 +1321,6 @@ function ItemList(id) //{{{
         if (typeof a == "function")
             a = a();
 
-        XML.ignoreWhitespace = true;
         let row =
             <ul class="hl-CompItem">
                 <li class="hl-CompIcon">{a ? <img src={a}/> : <></>}</li>
@@ -1372,9 +1371,10 @@ function ItemList(id) //{{{
 
 
         // do a full refill of the list:
-
         XML.ignoreWhitespace = true;
-        let div = <div class="ex-command-output hl-Normal">
+        let minWidth = document.getElementById("liberator-commandline").scrollWidth;
+        let div = <div class="ex-command-output hl-Normal"
+                       style={"white-space: normal; min-width: " + minWidth + "px"}>
                       <span class="hl-Title">Completions:</span>
                       <div class="hl-Completions">
                       {