diff --git a/lib/rex/ui/text/dispatcher_shell.rb b/lib/rex/ui/text/dispatcher_shell.rb
index cabb762515..74ef72ad17 100644
--- a/lib/rex/ui/text/dispatcher_shell.rb
+++ b/lib/rex/ui/text/dispatcher_shell.rb
@@ -425,7 +425,7 @@ module DispatcherShell
       word.downcase.start_with?(str.downcase) || word =~ /^#{str}/i
     # Prepend the rest of the command (or it all gets replaced!)
     }.map { |word|
-      word = quote.nil? ? word.gsub(' ', '\ ') : quote.dup << word
+      word = quote.nil? ? word.gsub(' ', '\ ') : quote.dup << word << quote.dup
       tab_words.dup.push(word).join(' ')
     }
   end