diff --git a/src/components/Window.vue b/src/components/Window.vue
index ce4c66b..940df7c 100644
--- a/src/components/Window.vue
+++ b/src/components/Window.vue
@@ -52,6 +52,7 @@
           </q-item-section>
         </q-item>
         <q-item
+          v-if="false"
           clickable
           v-close-popup
           :disable="$props.disable"
@@ -265,6 +266,7 @@
   background: gray;
   width: 32px;
   height: 32px;
+  z-index: 999;
 }
 
 .absolute_up {
@@ -421,11 +423,6 @@ export default defineComponent({
       return signal_source.value.window_type == "EwindowType::Clock";
     });
 
-    reload_signal_source();
-    watch(props, (a, b) => {
-      reload_signal_source();
-    });
-
     let selected = ref(false);
     let can_move = ref(true);
     let can_resize = ref(true);
@@ -458,6 +455,16 @@ export default defineComponent({
       move_flag = false;
     };
 
+    reload_signal_source();
+
+    watch(
+      () => props.window,
+      (a, b) => {
+        reload_signal_source();
+        selected.value = false;
+        cleanMouseDownFlag();
+      }
+    );
     const flags = new _Flags();
     let ctrl_press_flag = false;
 
@@ -547,6 +554,7 @@ export default defineComponent({
           if (dir & flags.right_flag) {
             width_offset += h;
           }
+
           emit(
             "reset_geometry_offset",
             props.window,