diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 1348734f53..2c3cc496dc 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -618,7 +618,6 @@ var toolBar = (function () {
 
     that.toggle = function () {
         that.setActive(!isActive);
-        activeButton.editProperties({isActive: isActive});
         if (!isActive) {
             tablet.gotoHomeScreen();
         }
@@ -642,6 +641,8 @@ var toolBar = (function () {
             enabled: active
         }));
         isActive = active;
+        activeButton.editProperties({isActive: isActive});
+	
         var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
         if (!isActive) {