diff --git a/src/org/openstreetmap/josm/actions/SaveActionBase.java b/src/org/openstreetmap/josm/actions/SaveActionBase.java
index 331de0b..8cee263 100644
--- a/src/org/openstreetmap/josm/actions/SaveActionBase.java
+++ b/src/org/openstreetmap/josm/actions/SaveActionBase.java
@@ -204,8 +204,7 @@ public abstract class SaveActionBase extends DiskAccessAction {
                 fn += '.' + ((ExtensionFileFilter) ff).getDefaultExtension();
             }
             file = new File(fn);
-            // Confirm overwrite, except for OSX native file dialogs which already ask for confirmation (see #11362)
-            if (!(Main.isPlatformOsx() && FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.get()) && !confirmOverwrite(file))
+            if (!fc.getSelectedFile().exists() && !confirmOverwrite(file))
                 return null;
         }
         return file;
diff --git a/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java b/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
index 12258f6..1b6c50d 100644
--- a/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
+++ b/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
@@ -347,7 +347,8 @@ public class FileChooserManager {
             Main.pref.put(lastDirProperty, fc.getCurrentDirectory().getAbsolutePath());
         }
 
-        if (!open && !SaveActionBase.confirmOverwrite(fc.getSelectedFile())) {
+        if (!open && !FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.get() &&
+            !SaveActionBase.confirmOverwrite(fc.getSelectedFile())) {
             return null;
         }
         return fc;