Index: applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java
===================================================================
--- applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java	(revision 30523)
+++ applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java	(revision 30668)
@@ -1,17 +1,17 @@
 /*
  *      CommandLine.java
- * 
+ *
  *      Copyright 2011 Hind <foxhind@gmail.com>
- * 
+ *
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
  *      the Free Software Foundation; either version 2 of the License, or
  *      (at your option) any later version.
- * 
+ *
  *      This program is distributed in the hope that it will be useful,
  *      but WITHOUT ANY WARRANTY; without even the implied warranty of
  *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *      GNU General Public License for more details.
- * 
+ *
  *      You should have received a copy of the GNU General Public License
  *      along with this program; if not, write to the Free Software
@@ -19,5 +19,4 @@
  *      MA 02110-1301, USA.
  */
-
 package CommandLine;
 
@@ -61,4 +60,5 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
 import org.openstreetmap.josm.io.GpxWriter;
 import org.openstreetmap.josm.io.OsmWriter;
@@ -89,10 +89,9 @@
         commandSymbol = ": ";
         history = new History(100);
-        historyField = new JTextField();
-        textField = new JTextField() {
+        historyField = new DisableShortcutsOnFocusGainedTextField();
+        textField = new DisableShortcutsOnFocusGainedTextField() {
             @Override
             protected void processKeyEvent(KeyEvent e) {
                 if (e.getID() == KeyEvent.KEY_PRESSED) {
-                    //String text = textField.getText();
                     int code = e.getKeyCode();
                     if (code == KeyEvent.VK_ENTER) {