diff --git a/src/core/state.c b/src/core/state.c
index 769b884..53e08a3 100644
--- a/src/core/state.c
+++ b/src/core/state.c
@@ -386,14 +386,20 @@ void state_window_remove(state_t *state, window_id_t id) {
   p_delete(&window->class_name);
   p_delete(&window->instance_name);
 
-  for (size_t i = index + 1; i < state->window_count; i++) {
-    state->windows[i - 1] = state->windows[i];
+  if (array_erase(state->windows, state->window_count, index)) {
+    window = &state->windows[state->window_count];
+    p_clear(window, 1);
+    window->id            = ZDWM_WINDOW_ID_INVALID;
+    window->transient_for = ZDWM_WINDOW_ID_INVALID;
+    window->workspace_id  = ZDWM_WORKSPACE_ID_INVALID;
+
+    for (size_t i = 0; i < state->window_count; ++i) {
+      window = &state->windows[i];
+      if (window->transient_for != id) continue;
+
+      window->transient_for = ZDWM_WINDOW_ID_INVALID;
+    }
   }
-  window = &state->windows[state->window_count - 1];
-  p_clear(window, 1);
-  window->id           = ZDWM_WINDOW_ID_INVALID;
-  window->workspace_id = ZDWM_WORKSPACE_ID_INVALID;
-  state->window_count--;
 
   layer_stack_t *layer = &state->stacks[layer_type];
   if (layer) {
diff --git a/src/core/state.h b/src/core/state.h
index ff8d13b..a4f14f9 100644
--- a/src/core/state.h
+++ b/src/core/state.h
@@ -166,7 +166,7 @@ bool state_set_current_output(state_t *state, output_id_t output_id);
 const window_t *state_window_add(state_t *state, const window_info_t *info);
 const window_t *state_window_get(const state_t *state, window_id_t id);
 const window_t *state_window_at(const state_t *state, size_t index);
-/* 删除窗口，并同步将其从对应的堆叠栈中移除 */
+/* 删除窗口，同步将其从对应的堆叠栈中移除，并调整对应 workspace 的焦点窗口 */
 void state_window_remove(state_t *state, window_id_t id);
 size_t state_window_count(const state_t *state);