diff --git a/dialogs/keyboard-settings/command-dialog.c b/dialogs/keyboard-settings/command-dialog.c
index 9663076d..5bcc08b6 100644
--- a/dialogs/keyboard-settings/command-dialog.c
+++ b/dialogs/keyboard-settings/command-dialog.c
@@ -107,11 +107,11 @@ command_dialog_create_contents (CommandDialog *dialog,
   gtk_window_set_icon_name (GTK_WINDOW (dialog), "application-x-executable");
 
   /* Create cancel button */
-  button = gtk_button_new_with_label (_("Cancel"));
+  button = gtk_button_new_with_mnemonic (_("_Cancel"));
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CANCEL);
   gtk_widget_show (button);
 
-  button = gtk_button_new_with_label (_("OK"));
+  button = gtk_button_new_with_mnemonic (_("_OK"));
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
   gtk_widget_set_can_default (GTK_WIDGET(button), TRUE);
   gtk_widget_grab_default (button);
@@ -165,7 +165,7 @@ command_dialog_create_contents (CommandDialog *dialog,
       gtk_widget_show (label);
     }
 
-  label = gtk_label_new (_("Command:"));
+  label = gtk_label_new_with_mnemonic (_("Comm_and:"));
   gtk_widget_set_halign (GTK_WIDGET (label), GTK_ALIGN_START);
   gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_CENTER);
   gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
@@ -178,10 +178,11 @@ command_dialog_create_contents (CommandDialog *dialog,
   dialog->entry = gtk_entry_new ();
   gtk_entry_set_activates_default (GTK_ENTRY (dialog->entry), TRUE);
   gtk_entry_set_text (GTK_ENTRY (dialog->entry), action != NULL ? action : "");
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (dialog->entry));
   gtk_container_add (GTK_CONTAINER (hbox), dialog->entry);
   gtk_widget_show (dialog->entry);
 
-  dialog->button = gtk_button_new_with_label (_("Open"));
+  dialog->button = gtk_button_new_with_mnemonic (_("_Browse"));
   g_signal_connect_swapped (dialog->button, "clicked", G_CALLBACK (command_dialog_button_clicked), dialog);
   gtk_box_pack_start (GTK_BOX (hbox), dialog->button, FALSE, TRUE, 0);
   gtk_widget_show (dialog->button);
@@ -256,8 +257,8 @@ command_dialog_button_clicked (CommandDialog *dialog)
   chooser = gtk_file_chooser_dialog_new (_("Select command"),
                                          GTK_WINDOW (dialog),
                                          GTK_FILE_CHOOSER_ACTION_OPEN,
-                                         _("Cancel"), GTK_RESPONSE_CANCEL,
-                                         _("Open"), GTK_RESPONSE_OK, NULL);
+                                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                         _("_Open"), GTK_RESPONSE_OK, NULL);
 
   /* Add file chooser filters */
   filter = gtk_file_filter_new ();