Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/BackgroundMapDataSelectionDialog.cs
===================================================================
diff -u -rf06f5ec5e879a3790c3826bcd3d3855bea1ffef9 -r3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/BackgroundMapDataSelectionDialog.cs	(.../BackgroundMapDataSelectionDialog.cs)	(revision f06f5ec5e879a3790c3826bcd3d3855bea1ffef9)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/BackgroundMapDataSelectionDialog.cs	(.../BackgroundMapDataSelectionDialog.cs)	(revision 3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330)
@@ -60,9 +60,9 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="MapData"/> from the selected row in the <see cref="DataGridViewControl"/>.
+        /// Gets the selected <see cref="WmtsMapData"/> or <c>null</c> if none selected.
         /// </summary>
-        public MapData SelectedMapData { get; private set; }
+        public WmtsMapData SelectedMapData { get; private set; }
 
         protected override void Dispose(bool disposing)
         {
@@ -105,7 +105,7 @@
 
         private void UpdateSelectButton()
         {
-            selectButton.Enabled = SelectedMapData != null;
+            selectButton.Enabled = currentMapDataControl?.SelectedMapData != null;
         }
 
         protected override Button GetCancelButton()
@@ -145,6 +145,7 @@
         private void OnSelectButtonClick(object sender, EventArgs e)
         {
             SetSelectedMapData();
+            DialogResult = DialogResult.OK;
             Close();
         }