Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs
===================================================================
diff -u -re25d2b8b5045ee7549f406cfb8a4ea0f81ec7a7d -r1ca50173f4b169dd9a4c5200e59cdc7a48e135a8
--- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs	(.../DataGridViewControl.cs)	(revision e25d2b8b5045ee7549f406cfb8a4ea0f81ec7a7d)
+++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs	(.../DataGridViewControl.cs)	(revision 1ca50173f4b169dd9a4c5200e59cdc7a48e135a8)
@@ -453,7 +453,11 @@
         private void EndCellEdit()
         {
             var currentCell = dataGridView.CurrentCell;
-            dataGridView.CurrentCell = null;
+
+            // End edits of current cell:
+            dataGridView.CurrentCell = null; // Setting to null has side-effect of removing selection highlight
+
+            // Restore selection highlight:
             dataGridView.CurrentCell = currentCell;
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -rba9236580e1e4361d4c5392c238f8b9930aaa90e -r1ca50173f4b169dd9a4c5200e59cdc7a48e135a8
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision ba9236580e1e4361d4c5392c238f8b9930aaa90e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 1ca50173f4b169dd9a4c5200e59cdc7a48e135a8)
@@ -565,10 +565,9 @@
                 return;
             }
 
-            var selection = CreateSelectedItemFromCurrentRow();
-
-            if ((ApplicationSelection.Selection == null && selection != null)
-                || (ApplicationSelection.Selection != null && !ApplicationSelection.Selection.Equals(selection)))
+            PipingInputContext selection = CreateSelectedItemFromCurrentRow();
+            if ((ApplicationSelection.Selection == null && selection != null) || 
+                (ApplicationSelection.Selection != null && !ApplicationSelection.Selection.Equals(selection)))
             {
                 ApplicationSelection.Selection = selection;
             }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -rba9236580e1e4361d4c5392c238f8b9930aaa90e -r1ca50173f4b169dd9a4c5200e59cdc7a48e135a8
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision ba9236580e1e4361d4c5392c238f8b9930aaa90e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 1ca50173f4b169dd9a4c5200e59cdc7a48e135a8)
@@ -368,8 +368,8 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var applicationSelectionMock = mocks.StrictMock<IApplicationSelection>();
             var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView();
+            var applicationSelectionMock = mocks.StrictMock<IApplicationSelection>();
             applicationSelectionMock.Expect(asm => asm.Selection).Return(null);
 
             mocks.ReplayAll();