diff --git a/common/content/commands.js b/common/content/commands.js
index 73fd1a74..3ee6b0d6 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -1239,7 +1239,8 @@ var Commands = Module("commands", {
             // dynamically get completions as specified with the command's completer function
             context.highlight();
             if (!command) {
-                context.highlight(0, args.commandName && args.commandName.length, "SPELLCHECK");
+                context.message = "No such command: " + match.cmd;
+                context.highlight(0, match.cmd.length, "SPELLCHECK");
                 return;
             }
 
diff --git a/common/content/options.js b/common/content/options.js
index 7c9b0856..401b1569 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -999,6 +999,7 @@ var Options = Module("options", {
             let opt = options.parseOpt(filter, modifiers);
             let prefix = opt.prefix;
 
+            context.highlight();
             if (context.filter.indexOf("=") == -1) {
                 if (false && prefix)
                     context.filters.push(function ({ item }) item.type == "boolean" || prefix == "inv" && isArray(item.values));