diff --git a/kitty/child-monitor.c b/kitty/child-monitor.c
index 5ccfce253..5460cd716 100644
--- a/kitty/child-monitor.c
+++ b/kitty/child-monitor.c
@@ -602,6 +602,8 @@ prepare_to_render_os_window(OSWindow *os_window, double now, unsigned int *activ
 
 static inline void
 render_os_window(OSWindow *os_window, double now, unsigned int active_window_id, color_type active_window_bg, unsigned int num_visible_windows) {
+    // ensure all pixels are cleared to background color at least once in every buffer
+    if (os_window->clear_count++ < 3) blank_os_window(os_window);
     Tab *tab = os_window->tabs + os_window->active_tab;
     BorderRects *br = &tab->border_rects;
     draw_borders(br->vao_idx, br->num_border_rects, br->rect_buf, br->is_dirty, os_window->viewport_width, os_window->viewport_height, active_window_bg, num_visible_windows, os_window);
diff --git a/kitty/glfw.c b/kitty/glfw.c
index 00211e76c..f31641486 100644
--- a/kitty/glfw.c
+++ b/kitty/glfw.c
@@ -818,9 +818,6 @@ is_mouse_hidden(OSWindow *w) {
 void
 swap_window_buffers(OSWindow *os_window) {
     glfwSwapBuffers(os_window->handle);
-    // ensure all pixels are cleared to background color at least once in the
-    // new buffer
-    if (os_window->clear_count++ < 2) blank_os_window(os_window);
 }
 
 void