1 files changed, 6 insertions, 3 deletions
diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 8e58c935..015330bd 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -465,13 +465,16 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
 
 void focus_cycle_popup_hide()
 {
+    gulong ignore_start;
+
+    ignore_start = event_start_ignore_all_enters();
+
     XUnmapWindow(ob_display, popup.bg);
     XFlush(ob_display);
 
-    popup.mapped = FALSE;
+    event_end_ignore_all_enters(ignore_start);
 
-    /* kill enter events cause by this unmapping */
-    event_ignore_all_queued_enters();
+    popup.mapped = FALSE;
 
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;