diff --git a/src/components/Window.vue b/src/components/Window.vue
index 5d1b02a..45c6cc2 100644
--- a/src/components/Window.vue
+++ b/src/components/Window.vue
@@ -369,7 +369,6 @@ export default defineComponent({
           }
           focused.value = newValue.focus;
           selected.value = old;
-          $store.commit("setSelectedWindow", props.window.uuid);
         }
       }
     );
@@ -402,6 +401,7 @@ export default defineComponent({
           selected.value = true;
           focused.value = true;
           emit("window_fouse_in", props.window.window_id);
+          $store.commit("setSelectedWindow", props.window.uuid);
         }
       },
       onMouseDown(evt: MouseEvent) {
diff --git a/src/pages/MediaControlPage.vue b/src/pages/MediaControlPage.vue
index 62efaa9..04b1f80 100644
--- a/src/pages/MediaControlPage.vue
+++ b/src/pages/MediaControlPage.vue
@@ -113,6 +113,9 @@ export default defineComponent({
               signal_source.window_type == "EwindowType::Multimedia" ||
               signal_source.window_type == "EwindowType::RTSP";
           }
+        } else {
+          selected_window.value = null;
+          is_multimedia_window.value = false;
         }
       }
     );
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index 4405d39..8cf5b57 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -459,6 +459,7 @@ export default defineComponent({
 
       onWallGridsClick(e: MouseEvent) {
         EventBus.getInstance().emit(EventNamesDefine.UnSelectAllWindows);
+        $store.commit("setSelectedWindow", "");
       },
       resetGeometryOffset(
         window: any,