Index: src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 1506)
+++ src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(working copy)
@@ -668,7 +668,8 @@
                     ds.ways.add(w);
                 }
             }
-            Main.main.addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", GpxLayer.this.name), null));
+            Main.main.addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", GpxLayer.this.name),
+                        data.storageFile));
             Main.main.removeLayer(GpxLayer.this);
         }
     }
Index: src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 1506)
+++ src/org/openstreetmap/josm/gui/layer/Layer.java	(working copy)
@@ -15,9 +15,9 @@
 import org.openstreetmap.josm.tools.Destroyable;
 
 /**
- * A layer encapsulates the gui componente of one dataset and its representation.
+ * A layer encapsulates the gui component of one dataset and its representation.
  *
- * Some layers may display data directly importet from OSM server. Other only
+ * Some layers may display data directly imported from OSM server. Other only
  * display background images. Some can be edited, some not. Some are static and
  * other changes dynamically (auto-updated).
  *
Index: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 1506)
+++ src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(working copy)
@@ -381,8 +381,9 @@
         }
     }
 
-    public static GpxData toGpxData(DataSet data) {
+    public static GpxData toGpxData(DataSet data, File file) {
         GpxData gpxData = new GpxData();
+        gpxData.storageFile = file;
         HashSet<Node> doneNodes = new HashSet<Node>();
         for (Way w : data.ways) {
             if (w.incomplete || w.deleted) continue;
@@ -432,7 +433,7 @@
     }
 
     public GpxData toGpxData() {
-        return toGpxData(data);
+        return toGpxData(data, associatedFile);
     }
 
     public class ConvertToGpxLayerAction extends AbstractAction {