diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 10de8e795d..a55dfc48cd 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3826,7 +3826,11 @@ ARDOUR_UI::plugin_scan_dialog (std::string type, std::string plugin)
 		scan_dlg->show_all();
 	}
 
-	gtk_main_iteration ();
+	/* due to idle calls, gtk_events_pending() may always return true */
+	int timeout = 30;
+	while (gtk_events_pending() && --timeout) {
+		gtk_main_iteration ();
+	}
 }
 
 void