diff --git a/ChangeLog b/ChangeLog
index 7375bff5c..cbccdb8f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-12  Havoc Pennington  <hp@pobox.com>
+
+	* src/session.c (warn_about_lame_clients_and_finish_interact):
+	don't display the dialog if all the apps were session managed.
+
 2002-07-12  Havoc Pennington  <hp@pobox.com>
 
 	* src/session.c: don't send SmInteractDone until the warning
diff --git a/src/session.c b/src/session.c
index 718d16c3d..62f912baa 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1777,6 +1777,13 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
   /* don't need to free displays */
   displays = NULL;
 
+  if (lame == NULL)
+    {
+      /* No lame apps. */
+      finish_interact (shutdown);
+      return;
+    }
+  
   lame = g_slist_sort (lame, (GCompareFunc) windows_cmp_by_title);
 
   len = g_slist_length (lame);