diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a07c8edb21..a90958f27d 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1461,12 +1461,12 @@ bool wxGridCellChoiceEditor::EndEdit(int row, int col,
                                      wxGrid* grid)
 {
     wxString value = Combo()->GetValue();
-    bool changed = value != m_startValue;
+    if ( value == m_startValue )
+        return false;
 
-    if ( changed )
-        grid->GetTable()->SetValue(row, col, value);
+    grid->GetTable()->SetValue(row, col, value);
 
-    return changed;
+    return true;
 }
 
 void wxGridCellChoiceEditor::Reset()