Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -rde0b2b5a31fa9519f50826a908665dfd17538720
--- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs	(.../DataGridViewControl.cs)	(revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs	(.../DataGridViewControl.cs)	(revision de0b2b5a31fa9519f50826a908665dfd17538720)
@@ -565,7 +565,7 @@
             if (currentColumn is DataGridViewCheckBoxColumn || currentColumn is DataGridViewComboBoxColumn)
             {
                 dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
-                dataGridView.Refresh();
+                dataGridView.EndEdit();
             }
         }
 
Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs
===================================================================
diff -u -r51b64230b9b947ba32821ed104809429d469959b -rde0b2b5a31fa9519f50826a908665dfd17538720
--- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs	(.../DataGridViewControlTest.cs)	(revision 51b64230b9b947ba32821ed104809429d469959b)
+++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs	(.../DataGridViewControlTest.cs)	(revision de0b2b5a31fa9519f50826a908665dfd17538720)
@@ -1575,7 +1575,7 @@
         }
 
         [Test]
-        public void DataGridViewControlCheckBoxColumn_EditValueDirtyStateChangedEventFired_ValueCommittedCellInEditMode()
+        public void DataGridViewControlCheckBoxColumn_EditValueDirtyStateChangedEventFired_ValueCommittedCellEndedEditMode()
         {
             // Setup
             using (var form = new Form())
@@ -1610,14 +1610,14 @@
                 gridTester.FireEvent("CurrentCellDirtyStateChanged", EventArgs.Empty);
 
                 // Assert
-                Assert.IsTrue(dataGridViewCell.IsInEditMode);
+                Assert.IsFalse(dataGridViewCell.IsInEditMode);
                 Assert.IsTrue(Convert.ToBoolean(dataGridViewCell.FormattedValue));
                 Assert.IsTrue(invalidated);
             }
         }
 
         [Test]
-        public void DataGridViewControlComboBoxColumn_EditValueDirtyStateChangedEventFired_ValueCommittedCellInEditMode()
+        public void DataGridViewControlComboBoxColumn_EditValueDirtyStateChangedEventFired_ValueCommittedCellEndedEditMode()
         {
             // Setup
             using (var form = new Form())
@@ -1659,7 +1659,7 @@
                 gridTester.FireEvent("CurrentCellDirtyStateChanged", EventArgs.Empty);
 
                 // Assert
-                Assert.IsTrue(dataGridViewCell.IsInEditMode);
+                Assert.IsFalse(dataGridViewCell.IsInEditMode);
                 Assert.AreEqual(TestEnum.DisplayName, dataGridViewCell.Value);
                 Assert.IsTrue(invalidated);
             }