diff --git a/docs/changes.txt b/docs/changes.txt
index dc85504f01..d1703b0c8e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -117,7 +117,9 @@ wxGTK:
 - added wxEVT_MENU_OPEN event generation
 - fixed bug in generic file selector causing incomplete file extensions to
   be appended to filenames with no extension
-- added SetSelection implementation for GTK+ 2
+- added wxTextCtrl::SetSelection implementation for GTK+ 2
+- fixed wxTextCtrl::IsEditable() for GTK+ 2
+- don't consume 100% CPU when showing a poup menu
 
 wxMac:
 
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index a3283de883..0bc4aafc66 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4214,8 +4214,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 a3283de883..0bc4aafc66 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4214,8 +4214,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;