Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 26202)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 27977)
@@ -145,9 +145,13 @@
             super(tr("Convert to GPX layer"), ImageProvider.get("converttogpx"));
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
+            if (Main.map.mapMode instanceof EditGpxMode) {
+                if (!Main.map.selectSelectTool(false)) {
+                    Main.map.selectZoomTool(false); // Select tool might not be support of active layer, zoom is always supported
+                }
+            }
             Main.main.addLayer(new GpxLayer(toGpxData(false), tr("Converted from: {0}", getName())));
             Main.main.removeLayer(EditGpxLayer.this);
-            if(Main.map.mapMode instanceof EditGpxMode)
-                Main.map.selectSelectTool(false);
         }
     }
@@ -158,9 +162,13 @@
             super(tr("Convert to GPX layer with anonymised time"), ImageProvider.get("converttogpx"));
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
+            if (Main.map.mapMode instanceof EditGpxMode) {
+                if (!Main.map.selectSelectTool(false)) {
+                    Main.map.selectZoomTool(false); // Select tool might not be support of active layer, zoom is always supported
+                }
+            }
             Main.main.addLayer(new GpxLayer(toGpxData(true), tr("Converted from: {0}", getName())));
             Main.main.removeLayer(EditGpxLayer.this);
-            if(Main.map.mapMode instanceof EditGpxMode)
-                Main.map.selectSelectTool(false);
         }
     }