diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 83c86bfd82..6069ecf6e4 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -33,6 +33,18 @@ ContextOverlayInterface::ContextOverlayInterface() {
 
     auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>().data();
     connect(entityTreeRenderer, SIGNAL(mousePressOnEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(createOrDestroyContextOverlay(const EntityItemID&, const PointerEvent&)));
+    connect(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"), &TabletProxy::tabletShownChanged, this, [&]() {
+        if (_contextOverlayJustClicked && _hmdScriptingInterface->isMounted()) {
+            QUuid tabletFrameID = _hmdScriptingInterface->getCurrentTabletFrameID();
+            QVariantMap props;
+            auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+            glm::vec3 position = myAvatar->getJointPosition("Head") + 0.6f * (myAvatar->getOrientation() * Vectors::FRONT);
+            props.insert("position", vec3toVariant(position));
+            props.insert("orientation", quatToVariant(myAvatar->getOrientation() * glm::quat(0.0f, 0.0f, 1.0f, 0.0f)));
+            qApp->getOverlays().editOverlay(tabletFrameID, props);
+            _contextOverlayJustClicked = false;
+        }
+    });
 }
 
 static const xColor BB_OVERLAY_COLOR = {255, 255, 0};
@@ -149,6 +161,7 @@ void ContextOverlayInterface::clickContextOverlay(const OverlayID& overlayID, co
         qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
         openMarketplace();
         destroyContextOverlay(_currentEntityWithContextOverlay, PointerEvent());
+        _contextOverlayJustClicked = true;
     }
 }
 
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
index f06f85eab7..812914a82e 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.h
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -19,6 +19,7 @@
 #include <DependencyManager.h>
 #include <PointerEvent.h>
 #include <ui/TabletScriptingInterface.h>
+#include "avatar/AvatarManager.h"
 
 #include "EntityScriptingInterface.h"
 #include "ui/overlays/Image3DOverlay.h"
@@ -66,6 +67,7 @@ private:
     bool _enabled { true };
     QUuid _currentEntityWithContextOverlay{};
     QString _entityMarketplaceID;
+    bool _contextOverlayJustClicked { false };
 
     void openMarketplace();
 };
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 9188f39a2e..257a56bf09 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -104,7 +104,6 @@
 
     function showTabletUI() {
         checkTablet()
-        gTablet.tabletShown = true;
 
         if (!tabletRezzed || !tabletIsValid()) {
             closeTabletUI();
@@ -123,6 +122,7 @@
             Overlays.editOverlay(HMD.tabletScreenID, { visible: true });
             Overlays.editOverlay(HMD.tabletScreenID, { maxFPS: 90 });
         }
+        gTablet.tabletShown = true;
     }
 
     function hideTabletUI() {