From 4dbe646c17000e1a58ca6c362f4f211a5b888c4a Mon Sep 17 00:00:00 2001
From: Vladyslav Stelmakhovskyi <vladstelmahovsky@gmail.com>
Date: Sat, 3 Jun 2017 15:40:25 +0200
Subject: [PATCH 1/2] Set ective button property isActive before Home menu
 redraw. Makes sure redraw will read proper value of isActive property

---
 scripts/system/edit.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 3c687f2f29..ea2b108016 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});
+
         if (!isActive) {
             entityListTool.setVisible(false);
             gridTool.setVisible(false);

From b7f8cc7f0b5a6a0b5f973035472789763e390649 Mon Sep 17 00:00:00 2001
From: Vladyslav Stelmakhovskyi <vladstelmahovsky@gmail.com>
Date: Thu, 8 Jun 2017 22:58:40 +0200
Subject: [PATCH 2/2] Fix intendantion

---
 scripts/system/edit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index eea35c5851..2c3cc496dc 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -641,9 +641,9 @@ var toolBar = (function () {
             enabled: active
         }));
         isActive = active;
-	activeButton.editProperties({isActive: isActive});
+        activeButton.editProperties({isActive: isActive});
 	
-	var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+        var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
         if (!isActive) {
             entityListTool.setVisible(false);