diff --git a/content/completion.js b/content/completion.js
index 3515176c..f4551b3d 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -893,19 +893,10 @@ function Completion() //{{{
 
         command: function command(filter)
         {
-            var completions = [];
-
             if (!filter)
-            {
-                for (let command in commands)
-                    completions.push([command.name, command.description]);
-                return [0, completions];
-            }
-
-            for (let command in commands)
-                completions.push([command.longNames, command.description]);
-
-            return [0, buildLongestStartingSubstring(completions, filter)];
+                return [0, [[c.name, c.description] for (c in commands)]];
+            else
+                return [0, this.filter([[c.longNames, c.description] for (c in commands)], filter, true)];
         },
 
         dialog: function dialog(filter) [0, this.filter(config.dialogs, filter)],