From 006c3a99dc8c8ba636cdd10edd29e9a103839744 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Fri, 27 Jan 2017 19:04:53 +0000
Subject: [PATCH] fix tablet menu crashing

---
 libraries/script-engine/src/TabletScriptingInterface.cpp | 1 +
 scripts/system/goto.js                                   | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp
index 1a028dd0a0..0e829b6953 100644
--- a/libraries/script-engine/src/TabletScriptingInterface.cpp
+++ b/libraries/script-engine/src/TabletScriptingInterface.cpp
@@ -203,6 +203,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
 void TabletProxy::gotoMenuScreen() {
     if (_qmlTabletRoot) {
         if (_state != State::Menu) {
+            removeButtonsFromHomeScreen();
             auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
             QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()), Qt::DirectConnection);
             QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));
diff --git a/scripts/system/goto.js b/scripts/system/goto.js
index c3af4c7927..95bd05ae73 100644
--- a/scripts/system/goto.js
+++ b/scripts/system/goto.js
@@ -20,13 +20,7 @@ var toolBar = null;
 var tablet = null;
 
 function onAddressBarShown(visible) {
-    if (tablet !== null) {
-        if (tablet.onHomeScreen === true) {
-            button.editProperties({isActive: visible});
-        }
-    } else {
-        button.editProperties({isActive: visible});
-    }
+    button.editProperties({isActive: visible});
 }
 
 function onClicked(){