Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs
===================================================================
diff -u -redb617ef7d51ddd52ed0b0095e679106925a837c -rb6d6acf62adcb4b23c4c5f6724fbd0091585bbb3
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs	(.../MacroStabilityInwardsCalculationsView.cs)	(revision edb617ef7d51ddd52ed0b0095e679106925a837c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs	(.../MacroStabilityInwardsCalculationsView.cs)	(revision b6d6acf62adcb4b23c4c5f6724fbd0091585bbb3)
@@ -131,6 +131,14 @@
             }
         }
 
+        public object Selection
+        {
+            get
+            {
+                return CreateSelectedItemFromCurrentRow();
+            }
+        }
+
         public object Data
         {
             get
@@ -158,14 +166,6 @@
             }
         }
 
-        public object Selection
-        {
-            get
-            {
-                return CreateSelectedItemFromCurrentRow();
-            }
-        }
-
         protected override void OnLoad(EventArgs e)
         {
             // Necessary to correctly load the content of the dropdown lists of the comboboxes...
@@ -177,7 +177,7 @@
         {
             if (disposing)
             {
-                dataGridViewControl.RemoveCellFormattingHandler(OnCellFormatting);
+                dataGridViewControl.CellFormatting -= OnCellFormatting;
 
                 assessmentSectionObserver.Dispose();
                 failureMechanismObserver.Dispose();
@@ -196,8 +196,8 @@
 
         private void InitializeDataGridView()
         {
-            dataGridViewControl.AddCurrentRowChangedHandler(DataGridViewOnCurrentCellChanged);
-            dataGridViewControl.AddCellFormattingHandler(OnCellFormatting);
+            dataGridViewControl.CurrentRowChanged += DataGridViewOnCurrentRowChangedHandler;
+            dataGridViewControl.CellFormatting += OnCellFormatting;
 
             dataGridViewControl.AddTextBoxColumn(
                 nameof(MacroStabilityInwardsCalculationRow.Name),
@@ -555,7 +555,7 @@
 
         #region Event handling
 
-        private void DataGridViewOnCurrentCellChanged(object sender, EventArgs e)
+        private void DataGridViewOnCurrentRowChangedHandler(object sender, EventArgs e)
         {
             OnSelectionChanged();
         }