diff --git a/src/core/bell.c b/src/core/bell.c
index 1e01cd636..87d8fa091 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -231,11 +231,11 @@ bell_flash_frame (MetaDisplay *display,
   
   g_assert (xkb_ev->xkb_type == XkbBellNotify);
   window = meta_display_lookup_x_window (display, xkb_bell_event->window);
-  if (!window && (display->focus_window) && (display->focus_window->frame))
+  if (!window && (display->focus_window))
     {
       window = display->focus_window;
     }
-  if (window)
+  if (window && window->frame)
     {
       bell_flash_window_frame (window);
     }