diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java b/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
index ada499264f89a0e7b529931b5365bca640ce3667..048e76647c412e6484099bd992807029ead0bcf7 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
@@ -529,21 +529,25 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         Locale l = fc.getLocale();
 
         enterFolderNameLabelText = UIManager.getString("FileChooser.enterFolderNameLabelText",l);
-        enterFolderNameLabelMnemonic = UIManager.getInt("FileChooser.enterFolderNameLabelMnemonic");
+        enterFolderNameLabelMnemonic = getMnemonic("FileChooser.enterFolderNameLabelMnemonic", l);
         enterFileNameLabelText = UIManager.getString("FileChooser.enterFileNameLabelText",l);
-        enterFileNameLabelMnemonic = UIManager.getInt("FileChooser.enterFileNameLabelMnemonic");
+        enterFileNameLabelMnemonic = getMnemonic("FileChooser.enterFileNameLabelMnemonic", l);
 
         filesLabelText = UIManager.getString("FileChooser.filesLabelText",l);
-        filesLabelMnemonic = UIManager.getInt("FileChooser.filesLabelMnemonic");
+        filesLabelMnemonic = getMnemonic("FileChooser.filesLabelMnemonic", l);
 
         foldersLabelText = UIManager.getString("FileChooser.foldersLabelText",l);
-        foldersLabelMnemonic = UIManager.getInt("FileChooser.foldersLabelMnemonic");
+        foldersLabelMnemonic = getMnemonic("FileChooser.foldersLabelMnemonic", l);
 
         pathLabelText = UIManager.getString("FileChooser.pathLabelText",l);
-        pathLabelMnemonic = UIManager.getInt("FileChooser.pathLabelMnemonic");
+        pathLabelMnemonic = getMnemonic("FileChooser.pathLabelMnemonic", l);
 
         filterLabelText = UIManager.getString("FileChooser.filterLabelText",l);
-        filterLabelMnemonic = UIManager.getInt("FileChooser.filterLabelMnemonic");
+        filterLabelMnemonic = getMnemonic("FileChooser.filterLabelMnemonic", l);
+    }
+
+    private Integer getMnemonic(String key, Locale l) {
+        return SwingUtilities2.getUIDefaultsInt(key, l);
     }
 
     protected void installIcons(JFileChooser fc) {
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java b/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
index 60ab1ac592627858cdc1ddb5f6325e52aed5f168..923cd9d18b9d7ff2ff71bb3e0707ce11447e8781 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
@@ -1215,11 +1215,6 @@ public class MotifLookAndFeel extends BasicLookAndFeel
             "EditorPane.focusInputMap", multilineInputMap,
 
 
-            "FileChooser.pathLabelMnemonic", new Integer(KeyEvent.VK_P), // 'p'
-            "FileChooser.filterLabelMnemonic", new Integer (KeyEvent.VK_R), // 'r'
-            "FileChooser.foldersLabelMnemonic", new Integer (KeyEvent.VK_L), // 'l'
-            "FileChooser.filesLabelMnemonic", new Integer (KeyEvent.VK_I), // 'i'
-            "FileChooser.enterFileNameLabelMnemonic", new Integer (KeyEvent.VK_N), // 'n'
             "FileChooser.ancestorInputMap",
                new UIDefaults.LazyInputMap(new Object[] {
                      "ESCAPE", "cancelSelection"
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties
index eb32a6d04a7e3c30df74aace3a3a1297b2819a2c..d3fee304abe61f5c9d4298c9ae57eea65b0098c5 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=Open
 FileChooser.updateButtonText=Update
 FileChooser.helpButtonText=Help
 FileChooser.pathLabelText=Enter path or folder name:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=Filter
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=Folders
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=Files
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=Enter file name:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=Enter folder name:
 
 FileChooser.cancelButtonToolTipText=Abort file chooser dialog.
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
index f1ee7ed76b11d006839ecaf65b8377ccc2bce998..e7723574a6d93478185ad1d59962125a9adc46c2 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=\u00D6ffnen
 FileChooser.updateButtonText=Aktualisieren
 FileChooser.helpButtonText=Hilfe
 FileChooser.pathLabelText=Pfad- oder Ordnernamen eingeben:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=Filter
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=Ordner
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=Dateien
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=Dateinamen eingeben:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=Ordnernamen eingeben:
 
 FileChooser.cancelButtonToolTipText=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
index c4e9108ff0e3a331179e211a21340b3a5f0e8949..6d9aa8f16bacf6ab6d85a3d818af877a2210688c 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=Abrir
 FileChooser.updateButtonText=Actualizar
 FileChooser.helpButtonText=Ayuda
 FileChooser.pathLabelText=Introducir nombre de la ruta de acceso o carpeta:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=Filtro
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=Carpetas
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=Archivos
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=Introducir nombre de archivo:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=Introducir nombre de carpeta:
 
 FileChooser.cancelButtonToolTipText=Abortar cuadro de di\u00E1logo del selector de archivos.
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
index 8644dea79302f3f6d6b44ccf80b966744359c42e..392ecee5bd29c6e5c85b40934ffe1122e611e493 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=Ouvrir
 FileChooser.updateButtonText=Mettre \u00E0 jour
 FileChooser.helpButtonText=Aide
 FileChooser.pathLabelText=Entrez le chemin ou le nom du dossier :
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=Filtre
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=Dossiers
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=Fichiers
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=Entrez le nom du fichier :
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=Entrez le nom du dossier :
 
 FileChooser.cancelButtonToolTipText=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties
index e637d6b5e8e579bce282edd4e2a8a482a65bf25a..9763045aee222a4f09d98f72e05a4e23a63303f3 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=Apri
 FileChooser.updateButtonText=Aggiorna
 FileChooser.helpButtonText=?
 FileChooser.pathLabelText=Percorso o nome cartella:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=Filtro
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=Cartelle
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=File
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=Nome file:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=Nome cartella:
 
 FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione file.
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
index 68342cc8544b0b088748ee6d7040495777b9d0ea..97b505b57415d30e28170b9b98a34e508052b31e 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=\u958B\u304F
 FileChooser.updateButtonText=\u66F4\u65B0
 FileChooser.helpButtonText=\u30D8\u30EB\u30D7
 FileChooser.pathLabelText=\u30D1\u30B9\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=\u30D5\u30A3\u30EB\u30BF
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=\u30D5\u30A9\u30EB\u30C0
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=\u30D5\u30A1\u30A4\u30EB
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5165\u529B:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B:
 
 FileChooser.cancelButtonToolTipText=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
index f522359b9072059caf2807c413c90abc51164db7..61c06c6949dd8a74a6b2fd41dae5625977b76985 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=\uC5F4\uAE30
 FileChooser.updateButtonText=\uAC31\uC2E0
 FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0
 FileChooser.pathLabelText=\uACBD\uB85C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uC785\uB825:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=\uD544\uD130
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=\uD3F4\uB354
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=\uD30C\uC77C
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=\uD30C\uC77C \uC774\uB984 \uC785\uB825:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=\uD3F4\uB354 \uC774\uB984 \uC785\uB825:
 
 FileChooser.cancelButtonToolTipText=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
index 63b5d9d0c2f8f022d5d00790a69b6bea39b59e1b..6e40ef51c062081821cb4d8bdad4d8f139d2b381 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=Abrir
 FileChooser.updateButtonText=Atualizar
 FileChooser.helpButtonText=Ajuda
 FileChooser.pathLabelText=Informar caminho ou nome da pasta:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=Filtro
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=Pastas
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=Arquivos
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=Informar nome do arquivo:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=Informar nome da pasta:
 
 FileChooser.cancelButtonToolTipText=Abortar caixa de di\u00E1logo do seletor de arquivos.
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
index 67a6c0787689acf1d70d35e93b998d999063c4fb..4cd736baa9dd681ea44481acd4e7a34444dee500 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=\u00D6ppna
 FileChooser.updateButtonText=Uppdatera
 FileChooser.helpButtonText=Hj\u00E4lp
 FileChooser.pathLabelText=Ange s\u00F6kv\u00E4g eller mappnamn:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=Filter
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=Mappar
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=Filer
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=Ange filnamn:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=Ange ett mappnamn:
 
 FileChooser.cancelButtonToolTipText=Avbryt dialogrutan Filv\u00E4ljare.
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
index a1576618dca693054505ff0411fc668586aa9054..121fe60a8ff34797c172928766b9436dd27281ff 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=\u6253\u5F00
 FileChooser.updateButtonText=\u66F4\u65B0
 FileChooser.helpButtonText=\u5E2E\u52A9
 FileChooser.pathLabelText=\u952E\u5165\u8DEF\u5F84\u6216\u6587\u4EF6\u5939\u540D: 
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=\u7B5B\u9009\u5668
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=\u6587\u4EF6\u5939
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=\u6587\u4EF6
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=\u952E\u5165\u6587\u4EF6\u540D: 
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=\u8F93\u5165\u6587\u4EF6\u5939\u540D:
 
 FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
diff --git a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
index f2985492b1ac1a0a64e0b6746eb58aba951b3005..1b2d9d76c4bc136108e44f74a02c0cb32bce4b3d 100644
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
@@ -27,10 +27,15 @@ FileChooser.openDialogTitleText=\u958B\u555F
 FileChooser.updateButtonText=\u66F4\u65B0
 FileChooser.helpButtonText=\u8AAA\u660E
 FileChooser.pathLabelText=\u8F38\u5165\u8DEF\u5F91\u6216\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.pathLabelMnemonic=80
 FileChooser.filterLabelText=\u7BE9\u9078
+FileChooser.filterLabelMnemonic=82
 FileChooser.foldersLabelText=\u8CC7\u6599\u593E
+FileChooser.foldersLabelMnemonic=76
 FileChooser.filesLabelText=\u6A94\u6848
+FileChooser.filesLabelMnemonic=73
 FileChooser.enterFileNameLabelText=\u8F38\u5165\u6A94\u6848\u540D\u7A31:
+FileChooser.enterFileNameLabelMnemonic=78
 FileChooser.enterFolderNameLabelText=\u8F38\u5165\u8CC7\u6599\u593E\u540D\u7A31:
 
 FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
index dec7d1b2c4ab376d7045e065dbb5affad3b81236..2e1168199c952c92424e3c081301ba3efd0e32d0 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
@@ -528,16 +528,16 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
 
         Locale l = fc.getLocale();
 
-        lookInLabelMnemonic = UIManager.getInt("FileChooser.lookInLabelMnemonic");
+        lookInLabelMnemonic = getMnemonic("FileChooser.lookInLabelMnemonic", l);
         lookInLabelText = UIManager.getString("FileChooser.lookInLabelText",l);
         saveInLabelText = UIManager.getString("FileChooser.saveInLabelText",l);
 
-        fileNameLabelMnemonic = UIManager.getInt("FileChooser.fileNameLabelMnemonic");
+        fileNameLabelMnemonic = getMnemonic("FileChooser.fileNameLabelMnemonic", l);
         fileNameLabelText = UIManager.getString("FileChooser.fileNameLabelText",l);
-        folderNameLabelMnemonic = UIManager.getInt("FileChooser.folderNameLabelMnemonic");
+        folderNameLabelMnemonic = getMnemonic("FileChooser.folderNameLabelMnemonic", l);
         folderNameLabelText = UIManager.getString("FileChooser.folderNameLabelText",l);
 
-        filesOfTypeLabelMnemonic = UIManager.getInt("FileChooser.filesOfTypeLabelMnemonic");
+        filesOfTypeLabelMnemonic = getMnemonic("FileChooser.filesOfTypeLabelMnemonic", l);
         filesOfTypeLabelText = UIManager.getString("FileChooser.filesOfTypeLabelText",l);
 
         upFolderToolTipText =  UIManager.getString("FileChooser.upFolderToolTipText",l);
@@ -550,6 +550,10 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
         viewMenuButtonAccessibleName = UIManager.getString("FileChooser.viewMenuButtonAccessibleName",l);
     }
 
+    private Integer getMnemonic(String key, Locale l) {
+        return SwingUtilities2.getUIDefaultsInt(key, l);
+    }
+
     protected void installListeners(JFileChooser fc) {
         super.installListeners(fc);
         ActionMap actionMap = getActionMap();
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index 18c76d780a788ab25ebedb8857f4cd2d23e90d1d..b8723035a327c20630788f33c01ab2bf7d75e3a2 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -770,9 +770,6 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
                                                                "icons/NewFolder.gif"),
             "FileChooser.useSystemExtensionHiding", Boolean.TRUE,
 
-            "FileChooser.lookInLabelMnemonic", Integer.valueOf(KeyEvent.VK_I),
-            "FileChooser.fileNameLabelMnemonic", Integer.valueOf(KeyEvent.VK_N),
-            "FileChooser.filesOfTypeLabelMnemonic", Integer.valueOf(KeyEvent.VK_T),
             "FileChooser.usesSingleFilePane", Boolean.TRUE,
             "FileChooser.noPlacesBar", new DesktopProperty("win.comdlg.noPlacesBar",
                                                            Boolean.FALSE),
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties
index 0900aa3eb696b509dd0c2a874add8a5c4e396fe5..0f27244f37a6c0483a081495bbf216c6f070432d 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Look in:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Save in:
 FileChooser.fileNameLabelText=File name:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Folder name:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Files of type:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Up One Level
 FileChooser.upFolderAccessibleName=Up
 FileChooser.homeFolderToolTipText=Home
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
index 993b26445f3f32b0ab623d348e8005e687de4baa..b9d8c341f47f9d19ae036f333c2879cb50523d73 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Suchen in:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Speichern in:
 FileChooser.fileNameLabelText=Dateiname:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Ordnername:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Dateityp:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her
 FileChooser.upFolderAccessibleName=Nach oben
 FileChooser.homeFolderToolTipText=Home
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
index adf964b0013bad59cf7c233af4f427e4fc51632c..d7b610e746dd547409a168d148d61508e30fc873 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Buscar en:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Guardar en:
 FileChooser.fileNameLabelText=Nombre de Archivo:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Nombre de la Carpeta:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Archivos de Tipo:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Subir un Nivel
 FileChooser.upFolderAccessibleName=Arriba
 FileChooser.homeFolderToolTipText=Inicio
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
index d4561daaadbd3e10c50b800c5bef6d13afed2f53..39736484777f713959863d39e64d1b1fb2f7ef0e 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Rechercher dans :
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Enregistrer dans :
 FileChooser.fileNameLabelText=Nom du fichier :
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Nom du dossier :
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Fichiers de type :
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
 FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties
index 4edf194a1738775af2c38c1f23734e82c3c91667..5e3e6f12634f960ffcb741a85c71ee7528bc9823 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Cerca in:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Salva in:
 FileChooser.fileNameLabelText=Nome file:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Nome della cartella:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Tipo file:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Cartella superiore
 FileChooser.upFolderAccessibleName=Superiore
 FileChooser.homeFolderToolTipText=Home
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
index 7c6c3053372380923bf626a48dcc2d2afd537ae6..adc5d930d69741374813f12d7f70aa35b46ddef9 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=\u53C2\u7167:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=\u4FDD\u5B58:
 FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078
 FileChooser.upFolderAccessibleName=\u4E0A\u3078
 FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
index 53dedb4d672d3c75add79f504476b4713e4fbc4d..6922556c77ee0784017e5024c73560c784fbd751 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58:
 FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C
 FileChooser.upFolderAccessibleName=\uC704\uB85C
 FileChooser.homeFolderToolTipText=\uD648
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
index 526a0f9e5f19e2e0b2d9566cd7a22e171c869b65..7faf8c19c80c385afba4035cc2910abe8b6774c5 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Consultar em:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Salvar em:
 FileChooser.fileNameLabelText=Nome do arquivo:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Nome da pasta:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Arquivos do tipo:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Um N\u00EDvel Acima
 FileChooser.upFolderAccessibleName=Acima
 FileChooser.homeFolderToolTipText=In\u00EDcio
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
index fc8358df46dfbae2af8256b34f8f1b9720349ba8..4e83498093f135b612f3e5516685a4fa6d8047b5 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Leta i:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Spara i:
 FileChooser.fileNameLabelText=Filnamn:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Mapp:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Filformat:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Upp en niv\u00E5
 FileChooser.upFolderAccessibleName=Upp
 FileChooser.homeFolderToolTipText=Hem
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
index ae6fe8033cb4c2523794fc97873eda2c2ea3a188..3a4c0cd6942087aff7a5767daa6a3240f22d89f7 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=\u67E5\u770B: 
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=\u4FDD\u5B58: 
 FileChooser.fileNameLabelText=\u6587\u4EF6\u540D: 
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D: 
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B: 
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7
 FileChooser.upFolderAccessibleName=\u5411\u4E0A
 FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55
diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
index fe18bdc2fa2f43d536ecd479c6d2be72497fa514..e4c8ad0c081b852b9a96b0b92182f44e08bacdbb 100644
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=\u67E5\u8A62:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=\u5132\u5B58\u65BC: 
 FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64
 FileChooser.upFolderAccessibleName=\u5F80\u4E0A
 FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties
index f7fd7fca4d8ba36ca99ec3661faeab4de66dfb4c..3ae82055bd96013856a2c3ca8b167f4baa019d1f 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Look In:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Save In:
 FileChooser.fileNameLabelText=File Name:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Folder name:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Files of Type:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Up One Level
 FileChooser.upFolderAccessibleName=Up
 FileChooser.homeFolderToolTipText=Home
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
index 14c676a0e08ac3b687d257d183d6fae5a46bcd3d..124449e236a997709a919f4d589d0c8a749a101f 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Suchen in:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Speichern in:
 FileChooser.fileNameLabelText=Dateiname:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Ordnername:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Dateityp:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her
 FileChooser.upFolderAccessibleName=Nach oben
 FileChooser.homeFolderToolTipText=Home
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
index 6cd153b4e5c2e8e0f4cae698cff48b255a50803f..4bfeaaf0e6175e06db2959f0b2489eb7b7d33ad7 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Buscar en:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Guardar en:
 FileChooser.fileNameLabelText=Nombre de Archivo:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Nombre de la Carpeta:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Archivos de Tipo:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Subir un Nivel
 FileChooser.upFolderAccessibleName=Arriba
 FileChooser.homeFolderToolTipText=Inicio
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
index ae099682341026186a431ce746514065a5e3de62..2f91a50036528bd82fcd5c959c842144e6a2b9d3 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Rechercher dans :
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Enregistrer dans :
 FileChooser.fileNameLabelText=Nom du fichier :
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Nom du dossier :
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Fichiers de type :
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
 FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
index ff581c782be83809a92c6b89b02a8ee21defe35b..b0bd9f030705ee7c241e05d0d66a7ba2f031a818 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Cerca in:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Salva in:
 FileChooser.fileNameLabelText=Nome file:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Nome della cartella:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Tipo file:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Cartella superiore
 FileChooser.upFolderAccessibleName=Superiore
 FileChooser.homeFolderToolTipText=Home
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
index d669fd5059eb03686c36de125c38b5ddd8496fb7..4e467cec4db57c1132f478c961e95a11b08b98a2 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=\u53C2\u7167:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=\u4FDD\u5B58:
 FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078
 FileChooser.upFolderAccessibleName=\u4E0A\u3078
 FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
index 7e8c3b483cbfdfcbb5560b40777db19c4020e40e..3cd5e20da121d913f6b4c192be816fe788063982 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58:
 FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C
 FileChooser.upFolderAccessibleName=\uC704\uB85C
 FileChooser.homeFolderToolTipText=\uD648
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
index 4e0fb3e934075761b9ea5da4ae4e0088991a4263..903f1d1bae018e55d7c6607fa0de0d0d519f49fa 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Consultar Em:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Salvar Em:
 FileChooser.fileNameLabelText=Nome do Arquivo:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Nome da pasta:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Arquivos do Tipo:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Um N\u00EDvel Acima
 FileChooser.upFolderAccessibleName=Acima
 FileChooser.homeFolderToolTipText=In\u00EDcio
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
index df1a453ae14004273b90ce874fefa3b4b4ff7427..0f76c987f1252f7a86c4a65b2fe96d98015d06a4 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=Leta i:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=Spara i:
 FileChooser.fileNameLabelText=Filnamn:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=Mapp:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=Filformat:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=Upp en niv\u00E5
 FileChooser.upFolderAccessibleName=Upp
 FileChooser.homeFolderToolTipText=Hem
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
index e3eca13ca02dd0b89f6d64397a062eac1bff3745..73405a09398129a966f5826dcae7b3e46e9915de 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=\u67E5\u770B:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=\u4FDD\u5B58:
 FileChooser.fileNameLabelText=\u6587\u4EF6\u540D:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7
 FileChooser.upFolderAccessibleName=\u5411\u4E0A
 FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55
diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
index a24f3e9edcab554006b2c837b3f04e931fc44f4a..6f70ad739ddc14da5d6b33d7d062b81d7991c52f 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
@@ -19,10 +19,14 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabelText=\u67E5\u8A62:
+FileChooser.lookInLabelMnemonic=73
 FileChooser.saveInLabelText=\u5132\u5B58\u65BC:
 FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31:
+FileChooser.fileNameLabelMnemonic=78
 FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.folderNameLabelMnemonic=78
 FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B:
+FileChooser.filesOfTypeLabelMnemonic=84
 FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64
 FileChooser.upFolderAccessibleName=\u5F80\u4E0A
 FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304
diff --git a/src/share/classes/java/awt/Component.java b/src/share/classes/java/awt/Component.java
index 2225633c0db5d6783b57663ae335b14fb7ed52ac..0e9fdbbb4f572f6f5589599bfbf86e744fdf994c 100644
--- a/src/share/classes/java/awt/Component.java
+++ b/src/share/classes/java/awt/Component.java
@@ -7910,7 +7910,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
                 res = toFocus.requestFocusInWindow(CausedFocusEvent.Cause.TRAVERSAL_BACKWARD);
             }
         }
-        if (!res) {
+        if (clearOnFailure && !res) {
             if (focusLog.isLoggable(PlatformLogger.FINER)) {
                 focusLog.finer("clear global focus owner");
             }
diff --git a/src/share/classes/javax/swing/AbstractButton.java b/src/share/classes/javax/swing/AbstractButton.java
index 50eb66e9f8ccf177da197a6328bbb7e5480ef879..d95f1d4b60218fa53541c610eecb49333c9842f0 100644
--- a/src/share/classes/javax/swing/AbstractButton.java
+++ b/src/share/classes/javax/swing/AbstractButton.java
@@ -981,6 +981,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
      * @param exception the message to use in the
      *        {@code IllegalArgumentException} that is thrown for an invalid
      *        value
+     * @return the {@code key} argument
      * @exception IllegalArgumentException if key is not one of the legal
      *            values listed above
      * @see #setHorizontalTextPosition
@@ -1011,6 +1012,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
      * @param exception the message to use in the
      *        {@code IllegalArgumentException} that is thrown for an invalid
      *        value
+     * @return the {@code key} argument
      * @exception IllegalArgumentException if key is not one of the legal
      *            values listed above
      */
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
index 21623c13ea0b7ed058b148204a7ad9b8b3e56351..1f3d97edf9b995b8f01e614c0542d82286423a5d 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
@@ -1153,10 +1153,15 @@ public class BasicFileChooserUI extends FileChooserUI {
                 if (shellFolder.isLink()) {
                     File linkedTo = shellFolder.getLinkLocation();
 
-                    if (linkedTo != null && fc.isTraversable(linkedTo)) {
-                        dir = linkedTo;
+                    // If linkedTo is null we try to use dir
+                    if (linkedTo != null) {
+                        if (fc.isTraversable(linkedTo)) {
+                            dir = linkedTo;
+                        } else {
+                            return;
+                        }
                     } else {
-                        return;
+                        dir = shellFolder;
                     }
                 }
             } catch (FileNotFoundException ex) {
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
index b3d38477bee511662be623ed47cc1dbcff95b779..27c519502cf48686e9fb399cd8e9be296ab1dea3 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
@@ -461,16 +461,16 @@ public class MetalFileChooserUI extends BasicFileChooserUI {
 
         Locale l = fc.getLocale();
 
-        lookInLabelMnemonic = UIManager.getInt("FileChooser.lookInLabelMnemonic");
+        lookInLabelMnemonic = getMnemonic("FileChooser.lookInLabelMnemonic", l);
         lookInLabelText = UIManager.getString("FileChooser.lookInLabelText",l);
         saveInLabelText = UIManager.getString("FileChooser.saveInLabelText",l);
 
-        fileNameLabelMnemonic = UIManager.getInt("FileChooser.fileNameLabelMnemonic");
+        fileNameLabelMnemonic = getMnemonic("FileChooser.fileNameLabelMnemonic", l);
         fileNameLabelText = UIManager.getString("FileChooser.fileNameLabelText",l);
-        folderNameLabelMnemonic = UIManager.getInt("FileChooser.folderNameLabelMnemonic");
+        folderNameLabelMnemonic = getMnemonic("FileChooser.folderNameLabelMnemonic", l);
         folderNameLabelText = UIManager.getString("FileChooser.folderNameLabelText",l);
 
-        filesOfTypeLabelMnemonic = UIManager.getInt("FileChooser.filesOfTypeLabelMnemonic");
+        filesOfTypeLabelMnemonic = getMnemonic("FileChooser.filesOfTypeLabelMnemonic", l);
         filesOfTypeLabelText = UIManager.getString("FileChooser.filesOfTypeLabelText",l);
 
         upFolderToolTipText =  UIManager.getString("FileChooser.upFolderToolTipText",l);
@@ -489,6 +489,10 @@ public class MetalFileChooserUI extends BasicFileChooserUI {
         detailsViewButtonAccessibleName = UIManager.getString("FileChooser.detailsViewButtonAccessibleName",l);
     }
 
+    private Integer getMnemonic(String key, Locale l) {
+        return SwingUtilities2.getUIDefaultsInt(key, l);
+    }
+
     protected void installListeners(JFileChooser fc) {
         super.installListeners(fc);
         ActionMap actionMap = getActionMap();
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
index f06d6d7715523626aa04b8dc4b980142acd60100..23debc1e664810ac590ea8461ebec834af4be2e7 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -844,9 +844,6 @@ public class MetalLookAndFeel extends BasicLookAndFeel
             "FileChooser.newFolderIcon", new SwingLazyValue("javax.swing.plaf.metal.MetalIconFactory", "getFileChooserNewFolderIcon"),
             "FileChooser.upFolderIcon", new SwingLazyValue("javax.swing.plaf.metal.MetalIconFactory", "getFileChooserUpFolderIcon"),
 
-            "FileChooser.lookInLabelMnemonic", new Integer(KeyEvent.VK_I),
-            "FileChooser.fileNameLabelMnemonic", new Integer(KeyEvent.VK_N),
-            "FileChooser.filesOfTypeLabelMnemonic", new Integer(KeyEvent.VK_T),
             "FileChooser.usesSingleFilePane", Boolean.TRUE,
             "FileChooser.ancestorInputMap",
                new UIDefaults.LazyInputMap(new Object[] {
diff --git a/src/windows/native/sun/windows/awt_FileDialog.cpp b/src/windows/native/sun/windows/awt_FileDialog.cpp
index a29a1ba94e6fa233ccd0712b33f9e6af27280fb2..abd6e120451f0e69b8c9ff4944cddb65cb61f944 100644
--- a/src/windows/native/sun/windows/awt_FileDialog.cpp
+++ b/src/windows/native/sun/windows/awt_FileDialog.cpp
@@ -153,6 +153,11 @@ FileDialogHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
             break;
         }
         case WM_DESTROY: {
+            HIMC hIMC = ::ImmGetContext(hdlg);
+            if (hIMC != NULL) {
+                ::ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
+            }
+
             WNDPROC lpfnWndProc = (WNDPROC)(::GetProp(parent, NativeDialogWndProcProp));
             ComCtl32Util::GetInstance().UnsubclassHWND(parent,
                                                        FileDialogWndProc,