diff --git a/src/command_manager.cc b/src/command_manager.cc
index c1d43e2e..96f4cb09 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -580,10 +580,7 @@ Completions CommandManager::complete(const Context& context,
         completions.end += start;
 
         for (auto& candidate : completions.candidates)
-        {
-            if (candidate.find_first_of(" \t;\"'") != String::npos)
-                candidate = '"' + escape(candidate, '"', '\\') + '"';
-        }
+            candidate = escape(candidate, " \t;", '\\');
 
         return completions;
     }