diff --git a/ChangeLog b/ChangeLog
index 02ad1ab1b..d2f619173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-09  Rob Adams  <robadams@ucla.edu>
+
+	* src/metacity-dialog.c (warn_about_no_sm_support): install an
+	alarm to timeout the no-sm-dialog after 4 minutes of inactivity.
+	Patch from Ximian.  See #114789.
+
 2003-06-07  Rob Adams  <robadams@ucla.edu>
 
 	* src/window.c (meta_window_new): call meta_group_compute_group
diff --git a/src/metacity-dialog.c b/src/metacity-dialog.c
index 717158ca0..e28145976 100644
--- a/src/metacity-dialog.c
+++ b/src/metacity-dialog.c
@@ -236,6 +236,9 @@ warn_about_no_sm_support (char **lame_apps)
                     G_CALLBACK (gtk_main_quit),
                     NULL);
 
+  /* Wait 4 minutes then force quit, so we don't wait around all night */
+  g_timeout_add (4 * 60 * 1000, (GSourceFunc) gtk_main_quit, NULL);
+
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);     
   list = create_lame_apps_list (lame_apps);