diff --git a/ChangeLog b/ChangeLog
index 992f6566..c2ec1c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+========================== version 0.5.2 ========================
+Cleanup:
+* Fixed silly hack when forcing GTK event processing.
 ========================== version 0.5.1 ========================
 Bug Fixes:
 * Updated chooser filters
diff --git a/gfceu b/gfceu
index fa9ea944..f5f823f6 100644
--- a/gfceu
+++ b/gfceu
@@ -274,11 +274,7 @@ def launch(passed, local=False):
   
   # os.system() is a blocker, so we must force
   # gtk to process our events.
-  # 20 iterations seems enough to me
-  # FIXME
-  # This seems like a bit of a dirty hack.  
-  # Does anyone know of a more elegant solution?
-  for x in range(0,2):
+  while gtk.events_pending():
     gtk.main_iteration_do()
   
   os.system(command)