Index: trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 457)
+++ trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 458)
@@ -6,4 +6,5 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.util.Collection;
 
@@ -25,12 +26,31 @@
 	public static final String[] modes = {
 		marktr("data"),
+		marktr("layer"),
 		marktr("selection"),
-		marktr("layer"),
 		marktr("conflict")
 	};
 	private final String mode;
 
+	private static int getModeShortcut(String mode) {
+		int shortcut = -1;
+
+		if(mode.equals("data")) {
+			shortcut = KeyEvent.VK_1;
+		}        
+		if(mode.equals("layer")) {
+			shortcut = KeyEvent.VK_2;
+		}
+		if(mode.equals("selection")) {
+			shortcut = KeyEvent.VK_3;
+		}
+		if(mode.equals("conflict")) {
+			shortcut = KeyEvent.VK_4;
+		}
+
+		return shortcut;
+	}
+    
 	public AutoScaleAction(String mode) {
-		super(tr("Zoom to {0}", mode), "dialogs/autoscale/"+mode, tr("Zoom the view to {0}.", tr(mode)), 0, 0, true);
+		super(tr("Zoom to {0}", mode), "dialogs/autoscale/"+mode, tr("Zoom the view to {0}.", tr(mode)), AutoScaleAction.getModeShortcut(mode), 0, true);
 		String modeHelp = Character.toUpperCase(mode.charAt(0))+mode.substring(1);
 		putValue("help", "Action/AutoScale/"+modeHelp);