Index: trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java	(revision 467)
+++ trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java	(revision 468)
@@ -6,4 +6,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import javax.swing.KeyStroke;
+import javax.swing.JComponent;
 
 import org.openstreetmap.josm.Main;
@@ -13,4 +15,8 @@
 	public UnselectAllAction() {
 		super(tr("Unselect All"),"unselectall", tr("Unselect all objects."), KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK, true);
+
+		// Add extra shortcut U
+		Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
+			KeyStroke.getKeyStroke(KeyEvent.VK_U, 0), tr("Unselect All"));
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 467)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 468)
@@ -51,8 +51,4 @@
 		Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
 			KeyStroke.getKeyStroke(KeyEvent.VK_N, 0), tr("Draw"));
-
-		// Add extra shortcut U
-		Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-			KeyStroke.getKeyStroke(KeyEvent.VK_U, 0), tr("Unselect All"));
 		
 		//putValue("help", "Action/AddNode/Autnode");