Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java	(revision 6738)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java	(revision 6739)
@@ -73,6 +73,7 @@
             }
             changeSelection(row, col, false, false);
-            editCellAt(getSelectedRow(), getSelectedColumn());
-            getEditorComponent().requestFocusInWindow();
+            if (editCellAt(getSelectedRow(), getSelectedColumn())) {
+                getEditorComponent().requestFocusInWindow();
+            }
         }
     }
@@ -104,6 +105,7 @@
             }
             changeSelection(row, col, false, false);
-            editCellAt(getSelectedRow(), getSelectedColumn());
-            getEditorComponent().requestFocusInWindow();
+            if (editCellAt(getSelectedRow(), getSelectedColumn())) {
+                getEditorComponent().requestFocusInWindow();
+            }
         }
     }