diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml index 481c7846a9..fcefd1af24 100644 --- a/interface/resources/qml/hifi/tablet/TabletRoot.qml +++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml @@ -81,6 +81,7 @@ Item { loader.item.subMenu = option; } loader.item.forceActiveFocus(); + tabletRoot.findStackableChild(); } } diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4e0cf46634..95620b1ddf 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5747,9 +5747,13 @@ bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name) } void Application::toggleRunningScriptsWidget() const { - static const QUrl url("hifi/dialogs/RunningScripts.qml"); - DependencyManager::get()->show(url, "RunningScripts"); - + static const QUrl url("../../hifi/dialogs/TabletRunningScripts.qml"); + auto tabletScriptingInterface = DependencyManager::get(); + auto tablet = dynamic_cast(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); + if (tablet) { + tablet->pushOntoStack(url); + } + //DependencyManager::get()->show(url, "RunningScripts"); //if (_runningScriptsWidget->isVisible()) { // if (_runningScriptsWidget->hasFocus()) { // _runningScriptsWidget->hide();