diff --git a/terminal.c b/terminal.c
index 9c90e37d..b568731c 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1633,6 +1633,15 @@ term_visual_focus_in(struct terminal *term)
     if (term->cursor_blink.active)
         cursor_blink_start_timer(term);
 
+#if 1
+    for (int i = 0; i < 5; i++)
+        wl_subsurface_set_desync(term->window->csd.sub_surface[i]);
+#endif
+    render_csd(term);
+#if 1
+    for (int i = 0; i < 5; i++)
+        wl_subsurface_set_sync(term->window->csd.sub_surface[i]);
+#endif
     cursor_refresh(term);
 }
 
@@ -1646,6 +1655,15 @@ term_visual_focus_out(struct terminal *term)
     if (term->cursor_blink.active)
         cursor_blink_stop_timer(term);
 
+#if 1
+    for (int i = 0; i < 5; i++)
+        wl_subsurface_set_desync(term->window->csd.sub_surface[i]);
+#endif
+    render_csd(term);
+#if 1
+    for (int i = 0; i < 5; i++)
+        wl_subsurface_set_sync(term->window->csd.sub_surface[i]);
+#endif
     cursor_refresh(term);
 }