Index: /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 3569)
+++ /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 3570)
@@ -73,5 +73,5 @@
             throw new IllegalArgumentException(MessageFormat.format("Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName()));
 
-        File file = createAndOpenSaveFileChooser(tr("Export GPX file"), ".gpx");
+        File file = createAndOpenSaveFileChooser(tr("Export GPX file"), "gpx");
         if (file == null)
             return;
Index: /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 3569)
+++ /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 3570)
@@ -188,16 +188,14 @@
 
         File file = fc.getSelectedFile();
-        if(extension != null){
-            String fn = file.getPath();
-            if(fn.indexOf('.') == -1)
-            {
-                FileFilter ff = fc.getFileFilter();
-                if (ff instanceof ExtensionFileFilter) {
-                    fn += "." + ((ExtensionFileFilter)ff).getDefaultExtension();
-                } else {
-                    fn += extension;
-                }
-                file = new File(fn);
-            }
+        String fn = file.getPath();
+        if(fn.indexOf('.') == -1)
+        {
+            FileFilter ff = fc.getFileFilter();
+            if (ff instanceof ExtensionFileFilter) {
+                fn += "." + ((ExtensionFileFilter)ff).getDefaultExtension();
+            } else if(extension != null) {
+                fn += "." + extension;
+            }
+            file = new File(fn);
         }
         if(file == null || (file.exists())) {