diff --git a/src/gui/jtk/Jtk_event.cc b/src/gui/jtk/Jtk_event.cc
index e75ab79..d710543 100644
--- a/src/gui/jtk/Jtk_event.cc
+++ b/src/gui/jtk/Jtk_event.cc
@@ -51,7 +51,7 @@ static bool ProcessXEvent(XEvent * x_event, Jtk_Event * event)
     return false;
 }
 
-void Jtk_WaitForEvent(Jtk_Event * event)
+void Jtk_WaitEvent(Jtk_Event * event)
 {
     for (;;)
     {
@@ -65,7 +65,7 @@ void Jtk_WaitForEvent(Jtk_Event * event)
         }
 
         /* Next check for an X event. */
-        if (XPending(g_display) > 0)
+        while (XPending(g_display) > 0)
         {
             XEvent x_event;
             XNextEvent(g_display, &x_event);
diff --git a/src/gui/jtk/Jtk_event.h b/src/gui/jtk/Jtk_event.h
index 88da58b..e889b43 100644
--- a/src/gui/jtk/Jtk_event.h
+++ b/src/gui/jtk/Jtk_event.h
@@ -39,6 +39,6 @@ typedef struct
     };
 } Jtk_Event;
 
-void Jtk_WaitForEvent(Jtk_Event * event);
+void Jtk_WaitEvent(Jtk_Event * event);
 
 #endif