Index: applications/editors/josm/plugins/editgpx/build.xml
===================================================================
--- applications/editors/josm/plugins/editgpx/build.xml	(revision 27973)
+++ applications/editors/josm/plugins/editgpx/build.xml	(revision 27977)
@@ -22,10 +22,10 @@
 ** and run
 **    > ant  publish
-** 
+**
 **
 -->
 <project name="editgpx" default="dist" basedir=".">
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="5035"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/editgpx/josm-editgpx.launch
===================================================================
--- applications/editors/josm/plugins/editgpx/josm-editgpx.launch	(revision 27973)
+++ applications/editors/josm/plugins/editgpx/josm-editgpx.launch	(revision 27977)
@@ -9,4 +9,4 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="editgpx"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="editgpx_svn"/>
 </launchConfiguration>
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 27973)
+++ 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);
         }
     }