diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml
index 87647efe3f..3239471a00 100644
--- a/interface/resources/qml/hifi/Desktop.qml
+++ b/interface/resources/qml/hifi/Desktop.qml
@@ -74,7 +74,6 @@ OriginalDesktop.Desktop {
         shown: tablet ? tablet.toolbarMode : false;
 
         onVisibleChanged: {
-            console.log("ZRF HERE DESKTOP.QML: " + visible + " " + sysToolbar.objectName);
             desktop.toolbarVisibleChanged(visible, sysToolbar.objectName);
         }
     }
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 32512e6316..0b114a2e3e 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -691,7 +691,7 @@ void OffscreenUi::createDesktop(const QUrl& url) {
 
         QString toolbarName = newObject->property("toolbarObjectName").toString(); // will return "com.highfidelity.interface.toolbar.system"
         auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>();
-        connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SLOT(onToolbarVisibleChanged(bool, QString)));
+        connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SIGNAL(toolbarVisibleChanged(bool, QString)));
 
         auto keyboardFocus = new KeyboardFocusHack();
         connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop()));
diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
index dc31d08e42..7ddc6463c3 100644
--- a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
+++ b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
@@ -119,9 +119,4 @@ ToolbarProxy* ToolbarScriptingInterface::getToolbar(const QString& toolbarId) {
     }
 
     return new ToolbarProxy(rawToolbar);
-}
-
-void ToolbarScriptingInterface::onToolbarVisibleChanged(bool isVisible, QString toolbarName) {
-    qDebug() << "ZRF HERE IN ENGINE SLOT" << isVisible << toolbarName;
-    emit ToolbarScriptingInterface::toolbarVisibleChanged(isVisible, toolbarName);
-}
+}
\ No newline at end of file
diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.h b/libraries/ui/src/ui/ToolbarScriptingInterface.h
index 8266bb93f2..952d3cce95 100644
--- a/libraries/ui/src/ui/ToolbarScriptingInterface.h
+++ b/libraries/ui/src/ui/ToolbarScriptingInterface.h
@@ -151,9 +151,6 @@ public:
      */
     Q_INVOKABLE ToolbarProxy* getToolbar(const QString& toolbarId);
 
-public slots:
-    void onToolbarVisibleChanged(bool isVisible, QString toolbarName);
-
 signals:
     void toolbarVisibleChanged(bool isVisible, QString toolbarName);
 };
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index bafc5fffe1..84ee93ecbf 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -457,12 +457,19 @@ function onGeometryChanged(rect) {
     }
 }
 
-function ensureFirstPersonCameraInHMD(isHMDMode) {
+function onDisplayModeChanged(isHMDMode) {
     if (isHMDMode) {
         Camera.setModeString("first person");
     }
 }
 
+function onToolbarVisibleChanged(isVisible, toolbarName) {
+    var toolbar = Toolbars.getToolbar(toolbarName);
+    if (isVisible) {
+        toolbar.writeProperty("visible", false);
+    }
+}
+
 
 function onStatusChanged() {
     sendLocalStatusToQml();
@@ -505,11 +512,12 @@ function startup() {
     updateOutputDeviceMutedOverlay(isOutputMuted());
     Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged);
     Window.geometryChanged.connect(onGeometryChanged);
-    HMD.displayModeChanged.connect(ensureFirstPersonCameraInHMD);
+    HMD.displayModeChanged.connect(onDisplayModeChanged);
     Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.serverInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.systemInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
+    Toolbars.toolbarVisibleChanged.connect(onToolbarVisibleChanged);
 
     oldShowAudioTools = AvatarInputs.showAudioTools;
     AvatarInputs.showAudioTools = false;
@@ -535,9 +543,7 @@ function shutdown() {
 
         if (!HMD.active) {
             var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
-            if (toolbar) {
-                toolbar.writeProperty("visible", true);
-            } 
+            toolbar.writeProperty("visible", true);
         }
     }
     
@@ -561,11 +567,12 @@ function shutdown() {
 
     Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged);
     Window.geometryChanged.disconnect(onGeometryChanged);
-    HMD.displayModeChanged.disconnect(ensureFirstPersonCameraInHMD);
+    HMD.displayModeChanged.disconnect(onDisplayModeChanged);
     Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.serverInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.systemInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
+    Toolbars.toolbarVisibleChanged.disconnect(onToolbarVisibleChanged);
 
     AvatarInputs.showAudioTools = oldShowAudioTools;
     AvatarInputs.showBubbleTools = oldShowBubbleTools;