Index: /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 15153)
+++ /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 15154)
@@ -152,5 +152,5 @@
     private static boolean isPosInOneShapeIfAny(ImageryInfo info, LatLon pos) {
         List<Shape> shapes = info.getBounds().getShapes();
-        return shapes == null || shapes.stream().anyMatch(s -> s.contains(pos));
+        return shapes == null || shapes.isEmpty() || shapes.stream().anyMatch(s -> s.contains(pos));
     }
 
@@ -185,5 +185,7 @@
                     .collect(Collectors.toList());
             if (!inViewLayers.isEmpty()) {
-                addDynamicSeparator();
+                if (inViewLayers.stream().anyMatch(i -> i.getImageryCategory() == ImageryCategory.PHOTO)) {
+                    addDynamicSeparator();
+                }
                 for (ImageryInfo i : inViewLayers) {
                     addDynamic(trackJosmAction(new AddImageryLayerAction(i)), i.getImageryCategory());