diff --git a/content/bookmarks.js b/content/bookmarks.js
index f46ea347..80497479 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -258,7 +258,7 @@ function Bookmarks() //{{{
 
             for (var i = 0; i < items.length; i++)
             {
-                var list = ":" + vimperator.commandline.getCommand() + "<br/>" +
+                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                            "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>keyword</th><th>URL</th><th align=\"right\">tags</th></tr>";
                 for (var i = 0; i < items.length; i++)
                 {
@@ -489,7 +489,7 @@ function History() //{{{
 
             for (var i = 0; i < items.length; i++)
             {
-                var list = ":" + vimperator.commandline.getCommand() + "<br/>" +
+                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                            "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
                 for (var i = 0; i < items.length; i++)
                 {
@@ -745,7 +745,7 @@ function Marks() //{{{
             }
         }
 
-        var list = ":" + vimperator.commandline.getCommand() + "<br/>" +
+        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                    "<table><tr align=\"left\" class=\"hl-Title\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
         for (var i = 0; i < marks.length; i++)
         {
@@ -841,7 +841,7 @@ function QuickMarks() //{{{
             }
         }
 
-        var list = ":" + vimperator.commandline.getCommand() + "<br/>" +
+        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                    "<table><tr align=\"left\" class=\"hl-Title\"><th>QuickMark</th><th>URL</th></tr>";
         for (var i = 0; i < marks.length; i++)
         {
diff --git a/content/buffers.js b/content/buffers.js
index 577e9c71..6f661722 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -232,7 +232,7 @@ function Buffer() //{{{
             var items = vimperator.completion.get_buffer_completions("");
             var number, indicator, title, url;
 
-            var list = ":" + vimperator.commandline.getCommand() + "<br/>" + "<table>";
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" + "<table>";
             for (var i = 0; i < items.length; i++)
             {
                 if (i == vimperator.tabs.index())
diff --git a/content/commands.js b/content/commands.js
index 7e5694e2..306030c7 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1442,7 +1442,7 @@ function Commands() //{{{
                         var total = "<td>  Total time:</td><td align=\"right\"><span style=\"color: red\">" +
                             (after_time - before_time) + "</span></td><td>msec</td>";
 
-                    var str = ":" + vimperator.commandline.getCommand() + "<br/>" +
+                    var str = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                               "<table>" +
                               "<tr align=\"left\" class=\"hl-Title\"><th colspan=\"3\">Code execution summary</th></tr>" +
                               "<tr><td>  Executed:</td><td align=\"right\"><span style=\"color: green\">" + count + "</span></td><td>times</td></tr>" +
diff --git a/content/options.js b/content/options.js
index 3aeaecbc..29f743e0 100644
--- a/content/options.js
+++ b/content/options.js
@@ -304,7 +304,7 @@ function Options() //{{{
     this.list = function()
     {
         // TODO: columns like Vim?
-        var list = ":" + vimperator.commandline.getCommand() + "<br/>" +
+        var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
                    "<table><tr align=\"left\" class=\"hl-Title\"><th>--- Options ---</th></tr>";
         var name, value;