diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index 4e5d5fca27..800f4724c2 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -164,7 +164,7 @@
                 <md-option value="flagged"><var:string label:value="Flagged"/></md-option>
                 <md-option value="junk"><var:string label:value="Junk"/></md-option>
                 <md-option value="not_junk"><var:string label:value="Not Junk"/></md-option>
-                <md-option ng-value="key" ng-repeat="(key, value) in filterEditor.labels">{{ value[0] }}</md-option>
+                <md-option ng-value="key" ng-repeat="(key, value) in filterEditor.labels track by key">{{ value[0] }}</md-option>
               </md-select>
             </md-input-container>
 
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 8654b5bb61..cf85cbf3e2 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -27,7 +27,12 @@
       data.SOGoMailLabelsColorsValues = [];
       _.forEach(data.SOGoMailLabelsColors, function (value, key) {
         data.SOGoMailLabelsColorsKeys.push(key);
-        data.SOGoMailLabelsColorsValues.push(value);
+        data.SOGoMailLabelsColorsValues.push(value); // value is an array of the user-defined name and color
+        if (key.charAt(0) == '$') {
+          Object.defineProperty(data.SOGoMailLabelsColors, '_' + key,
+                                Object.getOwnPropertyDescriptor(data.SOGoMailLabelsColors, key));
+          delete data.SOGoMailLabelsColors[key];
+        }
       });
 
       _.forEach(data.SOGoSieveFilters, function(filter) {