From d6477993a160e7f8c667849a645c523260c0173b Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 1 Nov 2018 13:08:00 -0700
Subject: [PATCH] Make it work better with the tablet

---
 interface/src/Menu.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 3636a2f45a..16e8af5683 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -268,9 +268,13 @@ Menu::Menu() {
     // Settings > Security...
     action = addActionToQMenuAndActionHash(settingsMenu, "Security...");
     connect(action, &QAction::triggered, [] {
-        auto tablet = dynamic_cast<TabletProxy*>(
-            DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
-        tablet->loadQMLSource(QString("hifi/dialogs/security/Security.qml"));
+		auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
+		auto hmd = DependencyManager::get<HMDScriptingInterface>();
+		tablet->pushOntoStack("hifi/dialogs/security/Security.qml");
+
+		if (!hmd->getShouldShowTablet()) {
+			hmd->toggleShouldShowTablet();
+		}
     });
 
     // Settings > Developer Menu