Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 2996)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 2997)
@@ -220,5 +220,8 @@
             switch(getSelectedColumnCount()) {
             case 1:
-                if (getSelectedColumn() == 0) {
+                if (isEditing()) {
+                    getCellEditor().cancelCellEditing();
+                    deleteTags();
+                } else if (getSelectedColumn() == 0) {
                     deleteTagNames();
                 } else if (getSelectedColumn() == 1) {
@@ -257,5 +260,5 @@
         protected void updateEnabledState() {
             if (isEditing() && getSelectedColumnCount() == 1 && getSelectedRowCount() == 1) {
-                setEnabled(false);
+                setEnabled(true);
             } else if (!isEditing() && getSelectedColumnCount() == 1 && getSelectedRowCount() == 1) {
                 setEnabled(true);