diff --git a/docs/changes.txt b/docs/changes.txt
index f25dede339..85ce5d783d 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -245,6 +245,7 @@ wxGTK:
 - implemented wxTextCtrl::Remove/Replace() for GTK2
 - improved X11 ShowFullScreen
 - added support for GTK2 label mnemonics
+- don't consume 100% CPU when showing a poup menu
 
 wxMSW:
 
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 098882920c..c0477b7eba 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4239,8 +4239,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 
     while (is_waiting)
     {
-        while (gtk_events_pending())
-            gtk_main_iteration();
+        gtk_main_iteration();
     }
 
     return TRUE;
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 098882920c..c0477b7eba 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4239,8 +4239,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 
     while (is_waiting)
     {
-        while (gtk_events_pending())
-            gtk_main_iteration();
+        gtk_main_iteration();
     }
 
     return TRUE;