diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index da68151fbe..014ab87c0f 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -545,6 +545,13 @@ var toolBar = (function () {
             checkEditPermissionsAndUpdate();
         });
 
+        HMD.displayModeChanged.connect(function () {
+            if (isActive) {
+                tablet.gotoHomeScreen();
+            }
+            that.setActive(false);
+        });
+
         Entities.canAdjustLocksChanged.connect(function (canAdjustLocks) {
             if (isActive && !canAdjustLocks) {
                 that.setActive(false);
@@ -606,7 +613,8 @@ var toolBar = (function () {
                     closeExistingDialogWindow();
                     dialogWindow = Desktop.createWindow("qml/hifi/tablet/New" + entityType + "Window.qml", {
                         title: "New " + entityType + " Entity",
-                        flags: Desktop.AlwaysOnTop | Desktop.ForceNative,
+                        flags: Desktop.ALWAYS_ON_TOP,
+                        presentationMode: Desktop.PresentationMode.NATIVE,
                         size: { x: 500, y: 300 },
                         visible: true
                     });
diff --git a/scripts/system/modules/createWindow.js b/scripts/system/modules/createWindow.js
index bf6231ddda..ad5ddb8e1f 100644
--- a/scripts/system/modules/createWindow.js
+++ b/scripts/system/modules/createWindow.js
@@ -92,7 +92,8 @@ module.exports = (function() {
             var windowRect = getWindowRect(this.settingsKey, defaultRect);
             this.window = Desktop.createWindow(this.qmlPath, {
                 title: this.title,
-                flags: Desktop.AlwaysOnTop | Desktop.ForceNative,
+                flags: Desktop.ALWAYS_ON_TOP,
+                presentationMode: Desktop.PresentationMode.NATIVE,
                 size: windowRect.size,
                 visible: true,
                 position: windowRect.position