diff --git a/src/js/commands/index.js b/src/js/commands/index.js
index 2f896e1c..4ad8128f 100644
--- a/src/js/commands/index.js
+++ b/src/js/commands/index.js
@@ -123,11 +123,11 @@ var parse = function(str) {
         method = thisMethod;
         // every valid regex has to have the parts of
         // <vcs> <command> <stuff>
-        // because there are always two spaces
+        // because there are always two space-groups
         // before our "stuff" we can simply
-        // split on spaces and grab everything after
+        // split on space-groups and grab everything after
         // the second:
-        options = str.split(' ').slice(2).join(' ');
+        options = str.match(/('.*?'|".*?"|\S+)/g).slice(2).join(' ');
       }
     });
   });