diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 8163de8..d84eb65 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2180,6 +2180,10 @@ emae_setup_service (EMAccountEditor *emae,
 		if (service->provider && (service->provider->url_flags & CAMEL_URL_NEED_PATH_DIR) == 0)
 			action = GTK_FILE_CHOOSER_ACTION_OPEN;
 
+		if (service->pathlabel)
+			gtk_label_set_text_with_mnemonic (GTK_LABEL (service->pathlabel),
+				action == GTK_FILE_CHOOSER_ACTION_OPEN ? _("Fil_e:") : _("_Path:"));
+
 		if (action != gtk_file_chooser_get_action (GTK_FILE_CHOOSER (service->pathentry)))
 			gtk_file_chooser_set_action (GTK_FILE_CHOOSER (service->pathentry), action);
 
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 2831747..d6fa441 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -4956,6 +4956,7 @@ For example: "Work" or "Personal"</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">_Path:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">source_path_entry</property>
                   </object>
                   <packing>
                     <property name="top_attach">2</property>
