diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index de033724..0e575c1c 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -978,7 +978,7 @@ var Options = Module("options", {
 }, {
 }, {
     commands: function initCommands(dactyl, modules, window) {
-        const { commands, contexts, options } = modules;
+        const { commandline, commands, contexts, options } = modules;
 
         let args = {
             getMode: function (args) findMode(args["-mode"]),
@@ -1048,7 +1048,7 @@ var Options = Module("options", {
                     }
 
                     if (name == "all" && reset)
-                        modules.commandline.input(_("pref.prompt.resetAll", config.host) + " ",
+                        commandline.input(_("pref.prompt.resetAll", config.host) + " ",
                             function (resp) {
                                 if (resp == "yes")
                                     for (let pref in values(prefs.getNames()))
@@ -1078,7 +1078,7 @@ var Options = Module("options", {
                         prefs.set(name, value);
                     }
                     else
-                        modules.commandline.commandOutput(prefs.list(onlyNonDefault, name));
+                        commandline.commandOutput(prefs.list(onlyNonDefault, name));
                     return;
                 }
 
diff --git a/common/tests/functional/testCommands.js b/common/tests/functional/testCommands.js
index 59724b55..d317cbf6 100644
--- a/common/tests/functional/testCommands.js
+++ b/common/tests/functional/testCommands.js
@@ -545,7 +545,7 @@ var tests = {
     set: {
         multiOutput: [
             "vb?", "cpt?", "messages?", "titlestring?", "au?", "eht?",
-            "cpt", "messages", "titlestring", "au", "eht"
+            "cpt", "messages", "titlestring", "au", "eht", "! "
         ],
         noOutput: ["vb", "novb"],
         completions: [