diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 31684cba..1c61a40a 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -69,9 +69,10 @@ var Option = Class("Option", {
         this._op = Option.ops[this.type];
 
         // Need to trigger setter
-        if (extraInfo && "values" in extraInfo)
+        if (extraInfo && "values" in extraInfo && !extraInfo.__lookupGetter__("values")) {
             this.values = extraInfo.values;
-        delete extraInfo.values;
+            delete extraInfo.values;
+        }
 
         if (extraInfo)
             update(this, extraInfo);