Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -rc84ff4276e1ecbf253df9ccf11f6eb0cf18db076 -ra1bdc4941a7918bf20b1ea7247a725aa568a2b68
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision c84ff4276e1ecbf253df9ccf11f6eb0cf18db076)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision a1bdc4941a7918bf20b1ea7247a725aa568a2b68)
@@ -741,7 +741,10 @@
 
         private void DataGridViewGotFocus(object sender, EventArgs eventArgs)
         {
-            dataGridView.BeginEdit(true); // Always start editing after setting the focus (otherwise data grid view cell dirty events are no longer fired when using the keyboard...)
+            if (dataGridView.CurrentCell != null)
+            {
+                dataGridView.BeginEdit(true); // Always start editing after setting the focus (otherwise data grid view cell dirty events are no longer fired when using the keyboard...)
+            }
         }
 
         private void DataGridViewOnCellClick(object sender, DataGridViewCellEventArgs e)