Index: Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs
===================================================================
diff -u -rd39f2e1a0a36628bbd7751d426425d8f99b2b5af -r5d503cf8885ced4799e5ad44242038d99e04b162
--- Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs	(.../ScenarioSelectionControl.cs)	(revision d39f2e1a0a36628bbd7751d426425d8f99b2b5af)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs	(.../ScenarioSelectionControl.cs)	(revision 5d503cf8885ced4799e5ad44242038d99e04b162)
@@ -71,17 +71,15 @@
             {
                 throw new ArgumentNullException("calculationsPerSection");
             }
-            dataGridViewControl.SetDataSource(scenarioRows);
 
             using (new SuspendDataGridViewColumnResizes(dataGridViewControl.GetColumnFromIndex(calculationsColumnIndex)))
             {
-                var columnItems = ((DataGridViewComboBoxColumn) dataGridViewControl.GetColumnFromIndex(calculationsColumnIndex)).Items;
+                dataGridViewControl.SetDataSource(scenarioRows);
+
+                var columnItems = ((DataGridViewComboBoxColumn)dataGridViewControl.GetColumnFromIndex(calculationsColumnIndex)).Items;
                 var items = calculations.Select(c => new DataGridViewComboBoxItemWrapper<ICalculation>(c));
                 SetItemsOnObjectCollection(columnItems, items.Cast<object>().ToArray());
-            }
 
-            using (new SuspendDataGridViewColumnResizes(dataGridViewControl.GetColumnFromIndex(calculationsColumnIndex)))
-            {
                 UpdateDataGridViewDataComboBoxesContent(calculationsPerSection);
             }
         }