diff --git a/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java b/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
index 2e4a10f..71e3351 100644
--- a/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
+++ b/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
@@ -6,6 +6,8 @@
 import java.awt.Frame;
 import java.io.File;
 import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
@@ -22,6 +24,7 @@
     /** The instance of the fileDialog */
     private final FileDialog fileDialog;
     private FileFilter fileFilter;
+    private List<FileFilter> fileFilters = new ArrayList<>();
     private int selectionMode;
 
     /**
@@ -43,6 +46,7 @@ public void addChoosableFileFilter(FileFilter filter) {
         // TODO implement this after Oracle fixes JDK-4811090 / JDK-6192906
         // https://bugs.openjdk.java.net/browse/JDK-4811090 : Extend awt filedialog
         // https://bugs.openjdk.java.net/browse/JDK-6192906 : Add more features to java.awt.FileDialog
+        fileFilters.add(filter);
     }
 
     @Override
@@ -50,7 +54,7 @@ public void addChoosableFileFilter(FileFilter filter) {
         // TODO implement this after Oracle fixes JDK-4811090 / JDK-6192906
         // https://bugs.openjdk.java.net/browse/JDK-4811090 : Extend awt filedialog
         // https://bugs.openjdk.java.net/browse/JDK-6192906 : Add more features to java.awt.FileDialog
-        return new FileFilter[]{};
+        return fileFilters.toArray(new FileFilter[0]);
     }
 
     @Override