diff --git a/src/tabs.py b/src/tabs.py
index feb4be37..27c23e95 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -905,7 +905,7 @@ class MucTab(ChatTab):
             add_after = after
         else:
             add_after = ' '
-        self.input.auto_completion(word_list, add_after)
+        self.input.auto_completion(word_list, add_after, quotify=False)
         empty_after = self.input.get_text() == '' or (self.input.get_text().startswith('/') and not self.input.get_text().startswith('//'))
         self.send_composing_chat_state(empty_after)
 
diff --git a/src/windows.py b/src/windows.py
index c156863e..bbae1ab7 100644
--- a/src/windows.py
+++ b/src/windows.py
@@ -940,7 +940,7 @@ class Input(Win):
             self.rewrite_text()
         return True
 
-    def auto_completion(self, word_list, add_after):
+    def auto_completion(self, word_list, add_after, quotify=True):
         """
         Complete the input, from a list of words
         if add_after is None, we use the value defined in completion
@@ -948,9 +948,10 @@ class Input(Win):
         completion (with no additional space)
         """
         completion_type = config.get('completion', 'normal')
-        for i, word in enumerate(word_list[:]):
-            if ' ' in word:
-                word_list[i] = '"' + word + '"'
+        if quotify:
+            for i, word in enumerate(word_list[:]):
+                if ' ' in word:
+                    word_list[i] = '"' + word + '"'
         if completion_type == 'shell' and self.text != '':
             self.shell_completion(word_list, add_after)
         else: