diff --git a/common/content/commandline.js b/common/content/commandline.js
index 159a1de9..31efa8d2 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -614,7 +614,7 @@ var CommandLine = Module("commandline", {
         if (this.widgets.message && this.widgets.message[1] === this._lastClearable)
             this.widgets.message = null;
 
-        if (modes.main != modes.COMMAND_LINE)
+        if (!this.commandSession)
             this.widgets.command = null;
 
         if (modes.main == modes.OUTPUT_MULTILINE && !mow.isScrollable(1))
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 80525f53..52b1b540 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -174,13 +174,13 @@ var RangeFinder = Module("rangefinder", {
             description: "Forward Find mode, active when typing search input",
             bases: [modes.FIND],
             input: true
-        }, { history: "search" });
+        });
         modes.addMode("FIND_BACKWARD", {
             extended: true,
             description: "Backward Find mode, active when typing search input",
             bases: [modes.FIND],
             input: true
-        }, { history: "search" });
+        });
     },
     commands: function (dactyl, modules, window) {
         const { commands, rangefinder } = modules;