diff --git a/content/bookmarks.js b/content/bookmarks.js
index 399d31a8..0ae4681e 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -258,7 +258,8 @@ function Bookmarks() //{{{
 
             for (var i = 0; i < items.length; i++)
             {
-                var list = "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>keyword</th><th>URL</th><th align=\"right\">tags</th></tr>";
+                var list = ":" + 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++)
                 {
                     var title = items[i][1].replace(/</, "&lt;").replace(/>/, "&gt;");
@@ -488,7 +489,8 @@ function History() //{{{
 
             for (var i = 0; i < items.length; i++)
             {
-                var list = "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
+                var list = ":" + 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++)
                 {
                     var title = items[i][1].replace(/</, "&lt;").replace(/>/, "&gt;");
@@ -743,7 +745,8 @@ function Marks() //{{{
             }
         }
 
-        var list = "<table><tr align=\"left\" class=\"hl-Title\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
+        var list = ":" + 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++)
         {
             list += "<tr>"
@@ -838,7 +841,8 @@ function QuickMarks() //{{{
             }
         }
 
-        var list = "<table><tr align=\"left\" class=\"hl-Title\"><th>QuickMark</th><th>URL</th></tr>";
+        var list = ":" + 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++)
         {
             list += "<tr><td>    " + marks[i][0] +
diff --git a/content/buffers.js b/content/buffers.js
index 0c6b4bee..f741eb33 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 = "<table>"
+            var list = ":" + 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 5cfaa6f3..0fad46d4 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1442,7 +1442,8 @@ 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 = "<table>" +
+                    var str = ":" + 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>" +
                               "<tr>" + each + "</tr>" +
diff --git a/content/mappings.js b/content/mappings.js
index 7e4d7271..fd4d0742 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -282,7 +282,6 @@ function Mappings() //{{{
         }
 
         var list = "<table>";
-
         for (var i = 0; i < maps.length; i++)
         {
             for (var j = 0; j < maps[i].names.length; j++)
diff --git a/content/options.js b/content/options.js
index cc12208a..3aeaecbc 100644
--- a/content/options.js
+++ b/content/options.js
@@ -304,8 +304,8 @@ function Options() //{{{
     this.list = function()
     {
         // TODO: columns like Vim?
-        var list = "<table>" +
-                   "<tr align=\"left\" class=\"hl-Title\"><th>--- Options ---</th></tr>";
+        var list = ":" + vimperator.commandline.getCommand() + "<br/>" +
+                   "<table><tr align=\"left\" class=\"hl-Title\"><th>--- Options ---</th></tr>";
         var name, value;
 
         for (var i = 0; i < options.length; i++)
diff --git a/content/ui.js b/content/ui.js
index ea8bf881..9ec8eccc 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -167,9 +167,7 @@ function CommandLine() //{{{
     {
         multiline_input_widget.collapsed = true;
 
-        // TODO: only some commands list the ex command above their output so
-        // this should be moved to the generating functions eg. v.buffers.list
-        var output = "<div class=\"ex-command-output\">" + ":" + command_widget.value.replace(/</, "&lt;").replace(/>/, "&gt;") + "<br/>" + str + "</div>";
+        var output = "<div class=\"ex-command-output\">" + str + "</div>";
         if (!multiline_output_widget.collapsed)
         {
             // FIXME: need to make sure an open MOW is closed when commands