Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 4899)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 4900)
@@ -95,5 +95,5 @@
     protected final SortedMap<String, String> colornames = new TreeMap<String, String>();
 
-    /** Mapping for list settings. Must not conatin null values */
+    /** Mapping for list settings. Must not contain null values */
     protected final SortedMap<String, List<String>> collectionProperties = new TreeMap<String, List<String>>();
     /** Defaults, can contain null values */
@@ -376,9 +376,9 @@
     }
 
-    synchronized public List<String> getAllPrefixKeys(final String prefix) {
+    synchronized public List<String> getAllPrefixCollectionKeys(final String prefix) {
         final List<String> all = new LinkedList<String>();
-        for (final Entry<String,String> e : properties.entrySet()) {
-            if (e.getKey().startsWith(prefix)) {
-                all.add(e.getKey());
+        for (final String e : collectionProperties.keySet()) {
+            if (e.startsWith(prefix)) {
+                all.add(e);
             }
         }
Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 4899)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 4900)
@@ -314,5 +314,5 @@
         // (2) User defined shortcuts
         LinkedList<Shortcut> shortcuts = new LinkedList<Shortcut>();
-        for(String s : Main.pref.getAllPrefixKeys("shortcut.entry.")) {
+        for(String s : Main.pref.getAllPrefixCollectionKeys("shortcut.entry.")) {
             shortcuts.add(new Shortcut(s));
         }