diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index 010544a2c6..8f393846c0 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -33,7 +33,13 @@ function shouldOpenFeedAfterShare() {
     return persisted && (persisted !== 'false');
 }
 function showFeedWindow() {
-    DialogsManager.showFeed();
+    if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar"))
+            || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar"))) {
+        DialogsManager.showFeed();
+    } else {
+        tablet.loadQMLSource("TabletAddressDialog.qml");
+        HMD.openTablet();
+    }
 }
 
 var outstanding;