Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 2645)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 2646)
@@ -431,11 +431,17 @@
         // Construct the list of loaded GPX tracks
         Collection<Layer> layerLst = Main.main.map.mapView.getAllLayers();
+        GpxDataWrapper defaultItem = null;
         Iterator<Layer> iterLayer = layerLst.iterator();
         while (iterLayer.hasNext()) {
             Layer cur = iterLayer.next();
             if (cur instanceof GpxLayer) {
-                gpxLst.add(new GpxDataWrapper(((GpxLayer) cur).getName(),
+                GpxDataWrapper gdw = new GpxDataWrapper(((GpxLayer) cur).getName(),
                         ((GpxLayer) cur).data,
-                        ((GpxLayer) cur).data.storageFile));
+                        ((GpxLayer) cur).data.storageFile);
+                gpxLst.add(gdw);
+                if (cur == yLayer.gpxLayer) {
+                    System.err.println("Hier!");
+                    defaultItem = gdw;
+                }
             }
         }
@@ -456,4 +462,7 @@
 
         cbGpx = new JComboBox(gpxLst);
+        if (defaultItem != null) {
+            cbGpx.setSelectedItem(defaultItem);
+        }
         panelCb.add(cbGpx);
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 2645)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 2646)
@@ -72,5 +72,6 @@
 
     List<ImageEntry> data;
-
+    GpxLayer gpxLayer;
+    
     private Icon icon = ImageProvider.get("dialogs/geoimage/photo-marker");
     private Icon selectedIcon = ImageProvider.get("dialogs/geoimage/photo-marker-selected");
@@ -132,4 +133,5 @@
         private HashSet<String> loadedDirectories = new HashSet<String>();
         private LinkedHashSet<String> errorMessages;
+        private GpxLayer gpxLayer;
 
         protected void rememberError(String message) {
@@ -140,4 +142,5 @@
             super(tr("Extracting GPS locations from EXIF"));
             this.selection = selection;
+            this.gpxLayer = gpxLayer;
             errorMessages = new LinkedHashSet<String>();
         }
@@ -187,5 +190,5 @@
                 data.add(e);
             }
-            layer = new GeoImageLayer(data);
+            layer = new GeoImageLayer(data, gpxLayer);
             files.clear();
         }
@@ -301,5 +304,5 @@
     }
 
-    private GeoImageLayer(final List<ImageEntry> data) {
+    private GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer) {
 
         super(tr("Geotagged Images"));
@@ -307,4 +310,5 @@
         Collections.sort(data);
         this.data = data;
+        this.gpxLayer = gpxLayer;
         Main.map.mapView.addPropertyChangeListener(this);
     }