diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index bf6a446..caadcdb 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -1089,9 +1089,20 @@ xfsm_manager_save_yourself_global (XfsmManager     *manager,
                                    XfsmShutdownType shutdown_type,
                                    gboolean         allow_shutdown_save)
 {
-  gboolean  shutdown_save = allow_shutdown_save;
-  GList    *lp;
-  GError   *error = NULL;
+  gboolean       shutdown_save;
+  GList         *lp;
+  GError        *error = NULL;
+  XfconfChannel *channel;
+
+  if (allow_shutdown_save)
+    {
+      channel = xfsm_open_config ();
+      shutdown_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
+    }
+  else
+    {
+      shutdown_save = FALSE;
+    }
 
   if (shutdown)
     {