Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 9274)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 9276)
@@ -144,7 +144,5 @@
      */
     public static boolean isDisplayingMapView() {
-        if (map == null) return false;
-        if (map.mapView == null) return false;
-        return true;
+        return map != null && map.mapView != null;
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java	(revision 9274)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java	(revision 9276)
@@ -43,5 +43,7 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null && Main.map.mapView != null && !Main.isOffline(OnlineResource.OSM_API));
+        setEnabled(Main.isDisplayingMapView()
+                && Main.map.mapView.getActiveLayer() != null
+                && !Main.isOffline(OnlineResource.OSM_API));
     }
 }