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 30633)
+++ /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 30634)
@@ -32,5 +32,4 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-
 public class EditGpxLayer extends Layer {
 
@@ -51,10 +50,9 @@
     public void initializeImport() {
         try {
-            if(data.isEmpty()) {
+            if (data.isEmpty()) {
                 layerImport.activateImport();
             }
         } catch (Exception e) {
-            System.out.println(e.getMessage());
-            e.printStackTrace();
+            Main.error(e);
         }
     }
Index: /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java
===================================================================
--- /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java	(revision 30633)
+++ /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java	(revision 30634)
@@ -21,9 +21,9 @@
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.editgpx.data.EditGpxData;
 import org.openstreetmap.josm.plugins.editgpx.data.EditGpxTrack;
 import org.openstreetmap.josm.plugins.editgpx.data.EditGpxTrackSegment;
 import org.openstreetmap.josm.plugins.editgpx.data.EditGpxWayPoint;
-
 
 public class EditGpxMode extends MapMode implements LayerChangeListener {
@@ -40,5 +40,6 @@
     }
 
-    @Override public void enterMode() {
+    @Override
+    public void enterMode() {
         super.enterMode();
         Main.map.mapView.addMouseListener(this);
@@ -48,5 +49,6 @@
     }
 
-    @Override public void exitMode() {
+    @Override
+    public void exitMode() {
         super.exitMode();
         Main.map.mapView.removeMouseListener(this);
@@ -54,11 +56,11 @@
     }
 
-
-    @Override public void mousePressed(MouseEvent e) {
+    @Override
+    public void mousePressed(MouseEvent e) {
         pointPressed = new Point(e.getPoint());
     }
 
-
-    @Override public void mouseDragged(MouseEvent e) {
+    @Override
+    public void mouseDragged(MouseEvent e) {
         if ( (e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) ==  InputEvent.BUTTON1_DOWN_MASK) {
             //if button1 is hold, draw the rectangle.
@@ -67,5 +69,6 @@
     }
 
-    @Override public void mouseReleased(MouseEvent e) {
+    @Override
+    public void mouseReleased(MouseEvent e) {
         if (e.getButton() != MouseEvent.BUTTON1) {
             return;
@@ -93,5 +96,4 @@
         oldRect = null;
         Main.map.mapView.repaint();
-
     }
 
@@ -149,5 +151,4 @@
     }
 
-
     public void setFrame(MapFrame mapFrame) {
         frame = mapFrame;
@@ -177,6 +178,11 @@
         if (oldLayer instanceof EditGpxLayer) {
             currentEditLayer = null;
-            if(Main.map.mapMode instanceof EditGpxMode)
-                Main.map.selectSelectTool(false);
+            if (Main.map.mapMode instanceof EditGpxMode) {
+                if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
+                    Main.map.selectSelectTool(false);
+                } else {
+                    Main.map.selectZoomTool(false);
+                }
+            }
         }
     }
Index: /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java
===================================================================
--- /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 30633)
+++ /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 30634)
@@ -31,6 +31,5 @@
 
 /**
- * Import GPX data from available layers
- *
+ * Import GPX data from available layers.
  *
  */
@@ -47,6 +46,5 @@
 
     /**
-     * shows a list of GPX layers. if user selects one the data from this layer is
-     * imported.
+     * shows a list of GPX layers. if user selects one the data from this layer is imported.
      */
     public void activateImport() {