diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 296ecf894..c152928d6 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -555,13 +555,6 @@ thunar_dialogs_show_job_ask_replace (GtkWindow  *parent,
                                         _("Replace _All"), THUNAR_JOB_RESPONSE_YES_ALL,
                                         _("_Replace"), THUNAR_JOB_RESPONSE_YES,
                                         NULL);
-  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
-                                           THUNAR_JOB_RESPONSE_YES,
-                                           THUNAR_JOB_RESPONSE_YES_ALL,
-                                           THUNAR_JOB_RESPONSE_NO,
-                                           THUNAR_JOB_RESPONSE_NO_ALL,
-                                           GTK_RESPONSE_CANCEL,
-                                           -1);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), THUNAR_JOB_RESPONSE_YES);
 
   /* determine the icon factory to use */
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index 0d53f8209..b2da0a863 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -819,7 +819,6 @@ thunar_properties_dialog_icon_button_clicked (GtkWidget              *button,
                                          _("_Cancel"), GTK_RESPONSE_CANCEL,
                                          _("_OK"), GTK_RESPONSE_ACCEPT,
                                          NULL);
-  gtk_dialog_set_alternative_button_order (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
   gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
   g_free (title);