diff --git a/expcore/commands.lua b/expcore/commands.lua
index 7b7b0c77..58efcbab 100644
--- a/expcore/commands.lua
+++ b/expcore/commands.lua
@@ -748,11 +748,11 @@ function Commands.run_command(command_event)
     -- Extract quoted arguments
     local raw_input = command_event.parameter or ''
     local quote_params = {}
-    local input_string = raw_input:gsub(' "[^"]-"', function(word)
-        word = word:sub(2)
+    local input_string = (' '..raw_input):gsub(' "[^"]-"', function(match)
+        local word = match:sub(2)
         local no_spaces = word:gsub('%s', '%%s')
         quote_params[no_spaces] = word:sub(2, -2)
-        return no_spaces
+        return ' '..no_spaces..' '
     end)
 
     -- Extract unquoted arguments