diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 33f3f203..c93705a7 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -39,8 +39,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
         styles.registerSheet("resource://dactyl-skin/dactyl.css");
 
-        prefs.safeSet("accessibility.typeaheadfind.autostart", false);
-
         this.cleanups = [];
         this.cleanups.push(util.overlayObject(window, {
             focusAndSelectUrlBar: function focusAndSelectUrlBar() {
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 131bed44..24bec182 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -31,6 +31,12 @@ var RangeFinder = Module("rangefinder", {
         set rangeFind(val) modules.buffer.localStore.rangeFind = val
     }),
 
+    init: function init() {
+        prefs.safeSet("accessibility.typeaheadfind.autostart", false);
+        // The above should be sufficient, but: https://bugzilla.mozilla.org/show_bug.cgi?id=348187
+        prefs.safeSet("accessibility.typeaheadfind", false);
+    },
+
     get commandline() this.modules.commandline,
     get modes() this.modules.modes,
     get options() this.modules.options,
@@ -250,10 +256,6 @@ var RangeFinder = Module("rangefinder", {
         const { options, rangefinder } = modules;
         const { prefs } = require("prefs");
 
-        // prefs.safeSet("accessibility.typeaheadfind.autostart", false);
-        // The above should be sufficient, but: https://bugzilla.mozilla.org/show_bug.cgi?id=348187
-        prefs.safeSet("accessibility.typeaheadfind", false);
-
         options.add(["hlfind", "hlf"],
             "Highlight all /find pattern matches on the current page after submission",
             "boolean", false, {