Index: src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 3376)
+++ src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(working copy)
@@ -202,6 +202,9 @@
         markersFromNamedTrackpoints.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 GpxData namedTrackPoints = new GpxData();
+
+                namedTrackPoints.waypoints.addAll(data.waypoints);
+
                 for (GpxTrack track : data.tracks) {
                     for (GpxTrackSegment seg : track.getSegments()) {
                         for (WayPoint point : seg.getWayPoints())