diff --git a/kitty/shaders.c b/kitty/shaders.c
index 890cc8f2a..2abaa1e08 100644
--- a/kitty/shaders.c
+++ b/kitty/shaders.c
@@ -1081,9 +1081,9 @@ draw_window_logo(const UIRenderData *ui) {
 
 bool
 screen_needs_rendering_in_layers(OSWindow *os_window, Window *w, Screen *screen) {
-    const bool has_ui = has_visual_bell(screen) || has_scrollbar(w, screen) || has_hyperlink_target(os_window, w, screen) || has_window_number(w, screen);
+    const bool has_ui = w && (has_visual_bell(screen) || has_scrollbar(w, screen) || has_hyperlink_target(os_window, w, screen) || has_window_number(w, screen) || w->window_logo.id);
     GraphicsManager *grman = screen->paused_rendering.expires_at && screen->paused_rendering.grman ? screen->paused_rendering.grman : screen->grman;
-    return has_ui || (w && w->window_logo.id) || grman_has_images(grman);
+    return has_ui || grman_has_images(grman);
 }
 
 // }}}