Index: src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java
===================================================================
--- src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java	(revision 9140)
+++ src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java	(working copy)
@@ -2,6 +2,8 @@
 package org.openstreetmap.josm.gui.conflict.tags;
 
 import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.EventObject;
 
 import javax.swing.JTable;
@@ -28,6 +30,13 @@
     /* --------------------------------------------------------------------------------- */
     @Override
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+        addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                stopCellEditing();
+            }
+        });
         setSelectedItem(value);
         this.originalValue = (RelationMemberConflictDecisionType) value;
         return this;