Index: trunk/src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java	(revision 15820)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java	(revision 15823)
@@ -43,6 +43,5 @@
     @Override
     protected PleaseWaitRunnable createTask() {
-        Collection<Way> selectedWays = getLayerManager().getEditDataSet().getSelectedWays();
-
+        Collection<Way> selectedWays = getLayerManager().getActiveDataSet().getSelectedWays();
         if (selectedWays.isEmpty()) {
             JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Please select 1 or more ways to download along"));
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java	(revision 15820)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java	(revision 15823)
@@ -152,7 +152,8 @@
      * @param listener The listener that will be notified of each combobox change
      */
-    protected final void addChangeListener(ChangeListener listener) {
+    protected final void addAndFireChangeListener(ChangeListener listener) {
         cbDownloadGpxData.addChangeListener(listener);
         cbDownloadOsmData.addChangeListener(listener);
+        listener.stateChanged(null);
     }
 
@@ -185,5 +186,9 @@
         };
 
-        addChangeListener(e -> options[0].setEnabled(isDownloadOsmData() || isDownloadGpxData()));
+        addAndFireChangeListener(e -> {
+            boolean somethingToDownload = isDownloadOsmData() || isDownloadGpxData();
+            options[0].setEnabled(somethingToDownload && MainApplication.getLayerManager().getEditLayer() != null);
+            options[1].setEnabled(somethingToDownload);
+        });
 
         int ret = HelpAwareOptionPane.showOptionDialog(MainApplication.getMainFrame(), this, title,