diff --git a/common/modules/contexts.jsm b/common/modules/contexts.jsm
index 95939716..f5d976ca 100644
--- a/common/modules/contexts.jsm
+++ b/common/modules/contexts.jsm
@@ -585,8 +585,8 @@ var Contexts = Module("contexts", {
                 completer: function (context, args) {
                     if (args.bang)
                         return;
-                    modules.completion.group(context);
                     context.filters.push(function ({ item }) !item.builtin);
+                    modules.completion.group(context);
                 }
             });
 
diff --git a/common/tests/functional/testCommands.js b/common/tests/functional/testCommands.js
index 86750083..c65365ac 100644
--- a/common/tests/functional/testCommands.js
+++ b/common/tests/functional/testCommands.js
@@ -184,7 +184,7 @@ var tests = {
         }
     ],
     delgroup: {
-        error: ["!", "", "builtin"],
+        error: ["", "! foo", "builtin"],
         completions: [""]
     },
     delmacros: {