diff --git a/common/content/commands.js b/common/content/commands.js
index 1efa14b6..119257ec 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -1194,8 +1194,8 @@ const Commands = Module("commands", {
         "":  quote("",  "|\\\\\\s'\"")
     };
     Commands.complQuote = {
-        '"': ['"', Commands.quoteArg['"'], '"'],
-        "'": ["'", Commands.quoteArg["'"], "'"],
+        '"': ['"', quote("", Commands.quoteArg['"'].list), '"'],
+        "'": ["'", quote("", Commands.quoteArg["'"].list), "'"],
         "":  ["", Commands.quoteArg[""], ""]
     };