Index: applications/editors/josm/plugins/FastDraw/build.xml
===================================================================
--- applications/editors/josm/plugins/FastDraw/build.xml	(revision 28165)
+++ applications/editors/josm/plugins/FastDraw/build.xml	(revision 28167)
@@ -30,5 +30,5 @@
 <project name="FastDraw" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="FastDraw: shortcut parsing"/>
+    <property name="commit.message" value="FastDraw: better shortcut handling after core changes"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5035"/>
Index: applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java
===================================================================
--- applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 28165)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 28167)
@@ -90,5 +90,6 @@
     private boolean lineWasSaved;
     private boolean deltaChanged;
-
+    private final int mainKeyCode;
+    
     FastDrawingMode(MapFrame mapFrame) {
         super(tr("FastDrawing"), "turbopen.png", tr("Fast drawing mode"), 
@@ -103,4 +104,5 @@
         cursorDrawing = ImageProvider.getCursor("crosshair", "mode");
         //loadPrefs();
+        mainKeyCode = getShortcut().getKeyStroke().getKeyCode();
     }
 
@@ -429,5 +431,8 @@
 
     private void doKeyEvent(KeyEvent e) {
-       // System.out.println(e);
+        if (getShortcut().isEvent(e)) { // repeated press
+            tryToLoadWay();
+            return;
+        }
         switch(e.getKeyCode()) {
         case KeyEvent.VK_BACK_SPACE:
@@ -464,4 +469,5 @@
         break;
         case KeyEvent.VK_DOWN:
+            if (ctrl || shift || alt) return;
             // more details
             e.consume();
@@ -470,4 +476,5 @@
         break;
         case KeyEvent.VK_UP:
+            if (ctrl || shift || alt) return;
             // less details
             e.consume();
@@ -494,7 +501,5 @@
             }
         break;
-        case KeyEvent.VK_T:
-            tryToLoadWay();
-        break;
+        
         case KeyEvent.VK_I:
            JOptionPane.showMessageDialog(Main.parent,