diff --git a/xfce4-session/xfsm-logout-dialog.c b/xfce4-session/xfsm-logout-dialog.c
index 2fab4894..cc3f6de5 100644
--- a/xfce4-session/xfsm-logout-dialog.c
+++ b/xfce4-session/xfsm-logout-dialog.c
@@ -227,7 +227,6 @@ xfsm_logout_dialog_init (XfsmLogoutDialog *dialog)
 
   gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
-  gtk_widget_grab_focus (button);
 
   /**
    * Reboot
@@ -845,6 +844,9 @@ xfsm_logout_dialog (const gchar      *session_name,
   /* set mode */
   xfsm_logout_dialog_set_mode (xfsm_dialog, MODE_LOGOUT_BUTTONS);
 
+  // Focus on cancel button to supply a "save default". 
+  //  ( This cannot be done inside _init (gets ignored))
+  gtk_widget_grab_focus(xfsm_dialog->button_cancel);
   result = xfsm_logout_dialog_run (GTK_DIALOG (dialog), !accessibility);
 
   gtk_widget_hide (dialog);