Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 849)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 850)
@@ -75,9 +75,13 @@
 	@Override public void actionPerformed(ActionEvent e) {
 		super.actionPerformed(e);
+		if(!Main.map.mapView.isDrawableLayer())
+			return;
 		doActionPerformed(e);
 	}
 
 	public void doActionPerformed(ActionEvent e) {
-	    boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
+		if(!Main.map.mapView.isDrawableLayer())
+			return;
+		boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
 		boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
 
@@ -101,4 +105,6 @@
 	@Override public void mouseClicked(MouseEvent e) {
 		if (e.getButton() != MouseEvent.BUTTON1)
+			return;
+		if(!Main.map.mapView.isDrawableLayer())
 			return;
 		boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;