Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -r54bb4197ebc3b67e9ba167a6669791726c33e12e -rc84ff4276e1ecbf253df9ccf11f6eb0cf18db076
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 54bb4197ebc3b67e9ba167a6669791726c33e12e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision c84ff4276e1ecbf253df9ccf11f6eb0cf18db076)
@@ -317,6 +317,7 @@
         private void InitializeGridColumns()
         {
             probabilityDistributionGrid.CurrentCellDirtyStateChanged += DataGridViewCurrentCellDirtyStateChanged;
+            probabilityDistributionGrid.GotFocus += DataGridViewGotFocus;
 
             var columnNameFormat = "column_{0}";
 
@@ -377,6 +378,11 @@
             }
         }
 
+        private void DataGridViewGotFocus(object sender, EventArgs eventArgs)
+        {
+            probabilityDistributionGrid.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 AssessmentSectionCompositionComboBoxSelectedIndexChanged(object sender, EventArgs e)
         {
             if (revertingComboBoxSelectedValue)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -r45422886165d23c507d16e432ddb025a49ca283e -rc84ff4276e1ecbf253df9ccf11f6eb0cf18db076
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 45422886165d23c507d16e432ddb025a49ca283e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision c84ff4276e1ecbf253df9ccf11f6eb0cf18db076)
@@ -175,6 +175,7 @@
         private void InitializeDataGridView()
         {
             dataGridView.CurrentCellDirtyStateChanged += DataGridViewCurrentCellDirtyStateChanged;
+            dataGridView.GotFocus += DataGridViewGotFocus;
             dataGridView.CellClick += DataGridViewOnCellClick;
             dataGridView.CellValidating += DataGridViewCellValidating;
             dataGridView.DataError += DataGridViewDataError;
@@ -738,6 +739,11 @@
             }
         }
 
+        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...)
+        }
+
         private void DataGridViewOnCellClick(object sender, DataGridViewCellEventArgs e)
         {
             if (updatingDataSource)