diff --git a/ChangeLog b/ChangeLog
index f2c2d05e..89567681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -117,6 +117,8 @@ Changes since version 0.80.2:
 - Fixed synchronization problem between hair cursor and mouse cursor in
   wmagnify with mouse cursor at the screen edge (Jon Diercks <jon@diercks.net>)
 - Fixed 2 focus switching related bugs (Allan Peramaki <aperamak@cc.hut.fi>)
+- Fixed a bug that made the crash panel to be shown again and again when the
+  'Restart Window Maker' option was selected, under some circumstances.
 
 
 Changes since version 0.80.1:
diff --git a/src/menu.c b/src/menu.c
index 025f60a7..8edb573a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2750,6 +2750,10 @@ wMenuRestoreState(WScreen *scr)
 {
     WMPropList *menus, *menu, *key, *skey;
 
+    if (!scr->session_state) {
+        return;
+    }
+
     key = WMCreatePLString("Menus");
     menus = WMGetFromPLDictionary(scr->session_state, key);
     WMReleasePropList(key);