diff --git a/ChangeLog b/ChangeLog
index a125e4b89..275fca391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-18  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): set
+	alternative button order on the password dialog.
+
 2008-03-18  Tor Lillqvist  <tml@novell.com>
 
 	Bug 99192 - Add --with-include-input-modules
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 543823044..6414c5c74 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -455,6 +455,11 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
                           NULL);
   gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
 
+  gtk_dialog_set_alternative_button_order (dialog,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   /* Build contents */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
@@ -620,7 +625,7 @@ question_dialog_button_clicked (GtkDialog       *dialog,
     }
   else
     g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
- 
+
   priv->dialog = NULL;
   g_object_notify (G_OBJECT (operation), "is-showing");
   gtk_widget_destroy (GTK_WIDGET (dialog));