Index: gnome-session-3.36.0/gnome-session/gsm-manager.c
===================================================================
--- gnome-session-3.36.0.orig/gnome-session/gsm-manager.c
+++ gnome-session-3.36.0/gnome-session/gsm-manager.c
@@ -3917,9 +3917,11 @@ do_query_end_session_exit (GsmManager *m
         }
 
         if (reboot || shutdown) {
-                g_signal_connect (manager->priv->system, "shutdown-prepared",
-                                  G_CALLBACK (on_shutdown_prepared), manager);
-                gsm_system_prepare_shutdown (manager->priv->system, reboot);
+                if (manager->priv->logout_mode == GSM_MANAGER_LOGOUT_MODE_FORCE) {
+                        g_signal_connect (manager->priv->system, "shutdown-prepared",
+                                          G_CALLBACK (on_shutdown_prepared), manager);
+                        gsm_system_prepare_shutdown (manager->priv->system, reboot);
+                }
                 return FALSE; /* don't leave query end session yet */
         }