Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330 -ra489d29ed1bf6bf0521644b809320b4b6407ec56
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a489d29ed1bf6bf0521644b809320b4b6407ec56)
@@ -104,7 +104,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Selecteren.
+        ///   Looks up a localized string similar to Selecteren....
         /// </summary>
         public static string BackgroundMapData_SelectMapData {
             get {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330 -ra489d29ed1bf6bf0521644b809320b4b6407ec56
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 3c1b0b97a6f8a5f3df4b9dad0164e69a886d1330)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision a489d29ed1bf6bf0521644b809320b4b6407ec56)
@@ -170,7 +170,7 @@
 Weet u zeker dat u wilt doorgaan?</value>
   </data>
   <data name="BackgroundMapData_SelectMapData" xml:space="preserve">
-    <value>Selecteren</value>
+    <value>Selecteren...</value>
   </data>
   <data name="BackgroundMapData_SelectMapData_Tooltip" xml:space="preserve">
     <value>Selecteer een kaartlaag.</value>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rc0ee4bb48b50e51d1676bbffde1857f4e78ffc06 -ra489d29ed1bf6bf0521644b809320b4b6407ec56
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision c0ee4bb48b50e51d1676bbffde1857f4e78ffc06)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision a489d29ed1bf6bf0521644b809320b4b6407ec56)
@@ -920,13 +920,9 @@
         private static void SetSelectedMapData(IAssessmentSection assessmentSection, ImageBasedMapData selectedMapData)
         {
             assessmentSection.BackgroundMapData.MapData = selectedMapData;
-            if (selectedMapData == null)
-            {
-                return;
-            }
+            assessmentSection.BackgroundMapData.IsVisible = selectedMapData != null;
             assessmentSection.BackgroundMapData.NotifyObservers();
             assessmentSection.NotifyObservers();
-            assessmentSection.BackgroundMapData.MapData.IsVisible = true;
         }
 
         #endregion
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0ee4bb48b50e51d1676bbffde1857f4e78ffc06 -ra489d29ed1bf6bf0521644b809320b4b6407ec56
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs	(.../BackgroundMapDataContextTreeNodeInfoTest.cs)	(revision c0ee4bb48b50e51d1676bbffde1857f4e78ffc06)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundMapDataContextTreeNodeInfoTest.cs	(.../BackgroundMapDataContextTreeNodeInfoTest.cs)	(revision a489d29ed1bf6bf0521644b809320b4b6407ec56)
@@ -34,10 +34,12 @@
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Forms;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.TreeNodeInfos
 {
@@ -186,6 +188,43 @@
         }
 
         [Test]
+        public void ContextMenuStrip_Always_ContextMenuItemSelectMapLayerEnabled()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
+            var context = new BackgroundMapDataContext(mapData);
+
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                mockRepository.ReplayAll();
+
+                using (var plugin = new RingtoetsPlugin())
+                {
+                    var info = GetInfo(plugin);
+                    plugin.Gui = gui;
+
+                    // Call
+                    using (ContextMenuStrip contextMenu = info.ContextMenuStrip(context, assessmentSection, treeViewControl))
+                    {
+                        const string expectedItemText = "Selecteren...";
+                        const string expectedItemTooltip = "Selecteer een kaartlaag.";
+                        TestHelper.AssertContextMenuStripContainsItem(contextMenu, selectContextMenuIndex,
+                                                                      expectedItemText, expectedItemTooltip,
+                                                                      RingtoetsCommonFormsResources.MapsIcon);
+                    }
+                }
+            }
+            // Assert
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
         public void GivenNoMapDataSet_WhenSelectingValidMapDataFromContextMenu_ThenMapDataSetAndNotifiesObserver()
         {
             // Given
@@ -196,8 +235,8 @@
             var backgroundMapDataObserver = mockRepository.StrictMock<IObserver>();
             backgroundMapDataObserver.Expect(o => o.UpdateObserver());
 
-            var wmtsMapData = new WmtsMapData("1", "2", "3", "image/");
-            var backgroundMapDataContext = new BackgroundMapDataContext(wmtsMapData);
+            WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
+            var backgroundMapDataContext = new BackgroundMapDataContext(mapData);
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())
@@ -233,7 +272,7 @@
                     contextMenuStrip.Items[selectContextMenuIndex].PerformClick();
 
                     // Then
-                    Assert.AreSame(wmtsMapData, assessmentSection.BackgroundMapData.MapData);
+                    Assert.AreSame(mapData, assessmentSection.BackgroundMapData.MapData);
                 }
             }
             mockRepository.VerifyAll();
@@ -247,8 +286,8 @@
             var assessmentSectionObserver = mockRepository.StrictMock<IObserver>();
             var backgroundMapDataObserver = mockRepository.StrictMock<IObserver>();
 
-            var wmtsMapData = new WmtsMapData("1", "2", "3", "image/");
-            var backgroundMapDataContext = new BackgroundMapDataContext(wmtsMapData);
+            WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
+            var backgroundMapDataContext = new BackgroundMapDataContext(mapData);
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())
@@ -301,8 +340,8 @@
             var backgroundMapDataObserver = mockRepository.StrictMock<IObserver>();
             backgroundMapDataObserver.Expect(o => o.UpdateObserver());
 
-            var wmtsMapData = new WmtsMapData("1", "2", "3", "image/");
-            var backgroundMapDataContext = new BackgroundMapDataContext(wmtsMapData);
+            WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
+            var backgroundMapDataContext = new BackgroundMapDataContext(mapData);
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())
@@ -322,7 +361,7 @@
                 assessmentSection.Attach(assessmentSectionObserver);
                 assessmentSection.BackgroundMapData.Attach(backgroundMapDataObserver);
 
-                assessmentSection.BackgroundMapData.MapData = wmtsMapData;
+                assessmentSection.BackgroundMapData.MapData = mapData;
 
                 DialogBoxHandler = (name, wnd) =>
                 {
@@ -340,7 +379,7 @@
                     contextMenuStrip.Items[selectContextMenuIndex].PerformClick();
 
                     // Then
-                    Assert.AreSame(wmtsMapData, assessmentSection.BackgroundMapData.MapData);
+                    Assert.AreSame(mapData, assessmentSection.BackgroundMapData.MapData);
                 }
             }
             mockRepository.VerifyAll();
@@ -354,8 +393,8 @@
             var assessmentSectionObserver = mockRepository.StrictMock<IObserver>();
             var backgroundMapDataObserver = mockRepository.StrictMock<IObserver>();
 
-            var wmtsMapData = new WmtsMapData("1", "2", "3", "image/");
-            var backgroundMapDataContext = new BackgroundMapDataContext(wmtsMapData);
+            WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
+            var backgroundMapDataContext = new BackgroundMapDataContext(mapData);
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())
@@ -374,7 +413,7 @@
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 assessmentSection.Attach(assessmentSectionObserver);
                 assessmentSection.BackgroundMapData.Attach(backgroundMapDataObserver);
-                assessmentSection.BackgroundMapData.MapData = wmtsMapData;
+                assessmentSection.BackgroundMapData.MapData = mapData;
 
                 DialogBoxHandler = (name, wnd) =>
                 {
@@ -392,7 +431,7 @@
                     contextMenuStrip.Items[selectContextMenuIndex].PerformClick();
 
                     // Then
-                    Assert.AreEqual(wmtsMapData, assessmentSection.BackgroundMapData.MapData);
+                    Assert.AreEqual(mapData, assessmentSection.BackgroundMapData.MapData);
                 }
             }
             mockRepository.VerifyAll();