Merge branch 'master' into pentool

Conflicts:
	manifest.json

1 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/presets/content.reel/content.js b/js/panels/presets/content.reel/content.js
index c43c593c..1ede7246 100644
--- a/js/panels/presets/content.reel/content.js
+++ b/js/panels/presets/content.reel/content.js
@@ -16,7 +16,7 @@ exports.content = Montage.create(Component, {
     },
     templateDidLoad : {
         value: function() {
-            var storedTabIndex = window.localStorage.presetsTabIndex;
+            var storedTabIndex = this.application.localStorage.getItem("presetsTabIndex");
             if(storedTabIndex) {
                 this.activeTabIndex = storedTabIndex;
             }
@@ -50,7 +50,7 @@ exports.content = Montage.create(Component, {
         },
         set: function(tabObject) {
             this.contentPanel = tabObject.key;
-            window.localStorage.presetsTabIndex = this.tabs.indexOf(tabObject);
+            this.application.localStorage.setItem("presetsTabIndex", this.tabs.indexOf(tabObject));
             this._tabToDeactivate = this._activeTab;
             this._activeTab = tabObject;