Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 9259)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 9260)
@@ -138,16 +138,5 @@
     }
 
-    private final transient Shortcut[] visibilityToggleShortcuts = new Shortcut[]{
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer1", tr("Toggle visibility of layer: {0}", 1), KeyEvent.VK_1, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer2", tr("Toggle visibility of layer: {0}", 2), KeyEvent.VK_2, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer3", tr("Toggle visibility of layer: {0}", 3), KeyEvent.VK_3, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer4", tr("Toggle visibility of layer: {0}", 4), KeyEvent.VK_4, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer5", tr("Toggle visibility of layer: {0}", 5), KeyEvent.VK_5, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer6", tr("Toggle visibility of layer: {0}", 6), KeyEvent.VK_6, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer7", tr("Toggle visibility of layer: {0}", 7), KeyEvent.VK_7, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer8", tr("Toggle visibility of layer: {0}", 8), KeyEvent.VK_8, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer9", tr("Toggle visibility of layer: {0}", 9), KeyEvent.VK_9, Shortcut.ALT),
-            Shortcut.registerShortcut("subwindow:layers:toggleLayer10", tr("Toggle visibility of layer: {0}", 10), KeyEvent.VK_0, Shortcut.ALT),
-    };
+    private final transient Shortcut[] visibilityToggleShortcuts = new Shortcut[10];
     private final ToggleLayerIndexVisibility[] visibilityToggleActions = new ToggleLayerIndexVisibility[10];
 
@@ -158,4 +147,7 @@
     private void createVisibilityToggleShortcuts() {
         for (int i = 0; i < 10; i++) {
+            final int i1 = i + 1;
+            visibilityToggleShortcuts[i] = Shortcut.registerShortcut("subwindow:layers:toggleLayer" + i1,
+                    tr("Toggle visibility of layer: {0}", i1), KeyEvent.VK_0 + (i1 % 10), Shortcut.ALT);
             visibilityToggleActions[i] = new ToggleLayerIndexVisibility(i);
             Main.registerActionShortcut(visibilityToggleActions[i], visibilityToggleShortcuts[i]);
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 9259)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 9260)
@@ -709,5 +709,5 @@
                 final String actionShortcutShiftKey = "properties:recent:shift:" + count;
                 final Shortcut sc = count > 10 ? null : Shortcut.registerShortcut(
-                        actionShortcutKey, tr("Choose recent tag {0}", count), KeyEvent.VK_0 + count, Shortcut.CTRL);
+                        actionShortcutKey, tr("Choose recent tag {0}", count), KeyEvent.VK_0 + (count % 10), Shortcut.CTRL);
                 final JosmAction action = new JosmAction(actionShortcutKey, null, tr("Use this tag again"), sc, false) {
                     @Override
@@ -721,5 +721,5 @@
                 };
                 final Shortcut scShift = count > 10 ? null : Shortcut.registerShortcut(
-                        actionShortcutShiftKey, tr("Apply recent tag {0}", count), KeyEvent.VK_0 + count, Shortcut.CTRL_SHIFT);
+                        actionShortcutShiftKey, tr("Apply recent tag {0}", count), KeyEvent.VK_0 + (count % 10), Shortcut.CTRL_SHIFT);
                 final JosmAction actionShift = new JosmAction(actionShortcutShiftKey, null, tr("Use this tag again"), scShift, false) {
                     @Override