diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js
index 4052f0e8d1..48fee7dcbd 100644
--- a/apps/common/main/lib/component/ThemeColorPalette.js
+++ b/apps/common/main/lib/component/ThemeColorPalette.js
@@ -59,7 +59,8 @@ define([
             value: '000000',
             enableKeyEvents: true,
             colorHints: true,
-            keyMoveDirection: 'both' // 'vertical', 'horizontal'
+            keyMoveDirection: 'both', // 'vertical', 'horizontal',
+            storageSuffix: ''
         },
 
         template    :
@@ -204,7 +205,7 @@ define([
                     this.lastSelectedIdx = -1;
                 }
 
-                var colors = Common.localStorage.getItem('asc.'+Common.localStorage.getId()+'.colors.custom');
+                var colors = Common.localStorage.getItem('asc.'+Common.localStorage.getId()+'.colors.custom' + this.options.storageSuffix);
                 colors = colors ? colors.split(',') : [];
 
                 var i = -1, colorEl, c = colors.length < this.options.dynamiccolors ? colors.length : this.options.dynamiccolors;
@@ -325,7 +326,7 @@ define([
         },
 
         saveCustomColor: function(color) {
-            var key_name = 'asc.'+Common.localStorage.getId()+'.colors.custom';
+            var key_name = 'asc.'+Common.localStorage.getId()+'.colors.custom' + this.options.storageSuffix;
             var colors = Common.localStorage.getItem(key_name);
             colors = colors ? colors.split(',') : [];
             if (colors.push(color) > this.options.dynamiccolors) colors.shift();
diff --git a/apps/common/main/lib/view/Draw.js b/apps/common/main/lib/view/Draw.js
index 5cda6a91ad..45dacc1e29 100644
--- a/apps/common/main/lib/view/Draw.js
+++ b/apps/common/main/lib/view/Draw.js
@@ -204,7 +204,8 @@ define([
                     themecolors: 0,
                     effects: 0,
                     columns: 4,
-                    outerMenu: {menu: button.menu, index: 0, focusOnShow: true}
+                    outerMenu: {menu: button.menu, index: 0, focusOnShow: true},
+                    storageSuffix: '-draw'
                 });
                 button.setPicker(picker);
                 picker.on('select', _.bind(button.onColorSelect, button));