Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -r318e5aca590b151a4df53abf8ef30f54e5dcf7fe -ra1bdc4941a7918bf20b1ea7247a725aa568a2b68
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 318e5aca590b151a4df53abf8ef30f54e5dcf7fe)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision a1bdc4941a7918bf20b1ea7247a725aa568a2b68)
@@ -247,7 +247,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...)
+            }
         }
 
         #region Nested types