diff --git a/src/csui/PlayerOverlay.vue b/src/csui/PlayerOverlay.vue
index 13459f5..72c3102 100644
--- a/src/csui/PlayerOverlay.vue
+++ b/src/csui/PlayerOverlay.vue
@@ -134,6 +134,7 @@
       :logger="logger"
       :in-player="!isGlobal"
       :site="site"
+      :defaultTab="defaultWindowTab"
       @close="uwWindowVisible = false"
       @preventClose="(event) => uwWindowFadeOutDisabled = event"
     ></PlayerUIWindow>
@@ -220,10 +221,9 @@ export default {
       statusFlags: {
         hasDrm: undefined,
       },
+      defaultWindowTab: 'videoSettings',
 
       saveState: {},
-
-      selectedTab: 'videoSettings',
     };
   },
   computed: {
@@ -406,10 +406,13 @@ export default {
       this.triggerZoneActive = active;
     },
 
-    showUwWindow() {
+    showUwWindow(tab) {
+      this.defaultWindowTab = tab; // can be undefined
+
       this.uwWindowFadeOut = false;
       this.uwWindowVisible = true;
       this.uwTriggerZoneVisible = false;
+      this.allowContextMenuHide();
 
       // refresh DRM status
       this.eventBus.send('get-drm-status');
@@ -447,10 +450,6 @@ export default {
 
     handleBusTunnelIn(payload) {
       this.eventBus.send(payload.action, payload.config, payload.routingData);
-    },
-
-    selectTab(tab) {
-      this.selectedTab = tab;
     }
   }
 }
diff --git a/src/csui/src/PlayerUIWindow.vue b/src/csui/src/PlayerUIWindow.vue
index a56ea84..286cfba 100644
--- a/src/csui/src/PlayerUIWindow.vue
+++ b/src/csui/src/PlayerUIWindow.vue
@@ -200,7 +200,8 @@ export default {
     'eventBus',
     'logger',
     'in-player',
-    'site'
+    'site',
+    'defaultTab'
   ],
   computed: {
     // LPT: NO ARROW FUNCTIONS IN COMPUTED,
@@ -211,6 +212,9 @@ export default {
     }
   },
   created() {
+    if (this.defaultTab) {
+      this.selectedTab = this.defaultTab;
+    }
     this.siteSettings = this.settings.getSiteSettings(this.site);
     this.tabs.find(x => x.id === 'changelog').highlight = !this.settings.active.whatsNewChecked;