diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 920d3565..ec08d861 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -1096,7 +1096,7 @@ var Options = Module("options", {
                     }
                     else {
                         var [matches, name, postfix, valueGiven, operator, value] =
-                            arg.match(/^\s*?([^=]+?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/);
+                            arg.match(/^\s*?((?:[^=\\']|\\.|'[^']*')+?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/);
                         reset = (postfix == "&");
                         invertBoolean = (postfix == "!");
                     }