diff --git a/common/content/find.js b/common/content/find.js
index b4c0ffe6..80306d6e 100644
--- a/common/content/find.js
+++ b/common/content/find.js
@@ -381,7 +381,7 @@ function Search() //{{{
             }
             else
             {
-                liberator.echo((up ? "?" : "/") + lastSearchPattern, null, commandline.FORCE_SINGLELINE);
+                commandline.echo((up ? "?" : "/") + lastSearchPattern, null, commandline.FORCE_SINGLELINE);
 
                 if (options["hlsearch"])
                     this.highlight(lastSearchString);
diff --git a/common/content/modes.js b/common/content/modes.js
index cc7dbc39..c3a74c1b 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -35,6 +35,8 @@ const modes = (function () //{{{
     var main = 1;     // NORMAL
     var extended = 0; // NONE
 
+    var lastShown = null;
+
     var passNextKey = false;
     var passAllKeys = false;
     var isRecording = false;
@@ -218,6 +220,7 @@ const modes = (function () //{{{
         reset: function (silent)
         {
             modeStack = [];
+            liberator.dump("reset");
             if (config.isComposeWindow)
                 this.set(modes.COMPOSE, modes.NONE, silent);
             else
diff --git a/common/content/ui.js b/common/content/ui.js
index 3f29aa46..c34783f1 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -882,6 +882,8 @@ function CommandLine() //{{{
         },
         set command(cmd) commandWidget.value = cmd,
 
+        get message() messageBox.value,
+
         open: function open(prompt, cmd, extendedMode)
         {
             // save the current prompts, we need it later if the command widget
@@ -1070,8 +1072,8 @@ function CommandLine() //{{{
                 if (events.isAcceptKey(key))
                 {
                     let mode = currentExtendedMode; // save it here, as modes.pop() resets it
-                    keepCommand = (mode == modes.EX); // Fixme.
-                    currentExtendedMode = null; /* Don't let modes.pop trigger "cancel" */
+                    keepCommand = true;
+                    currentExtendedMode = null; // Don't let modes.pop trigger "cancel"
                     modes.pop(!this.silent);
 
                     return liberator.triggerCallback("submit", mode, command);