diff --git a/scripts/system/libraries/toolBars.js b/scripts/system/libraries/toolBars.js
index 9efe533457..5a84bf9027 100644
--- a/scripts/system/libraries/toolBars.js
+++ b/scripts/system/libraries/toolBars.js
@@ -256,7 +256,6 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
                 y: y - ToolBar.SPACING
             });
         }
-        this.save();
     }
 
     this.setAlpha = function(alpha, tool) {
@@ -421,6 +420,9 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         for (var tool in that.tools) {
             that.tools[tool].buttonDown(false);
         }
+        if (that.mightBeDragging) {
+            that.save();
+        }
     }
     this.mouseMove  = function (event) {
         if (!that.mightBeDragging || !event.isLeftButton) {