Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re8fc2b04b5fc0172bca8534e2638e1fcb2745b23 -r7cc21db0f41f78d479db05b506b198d2c6c5bd25
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e8fc2b04b5fc0172bca8534e2638e1fcb2745b23)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7cc21db0f41f78d479db05b506b198d2c6c5bd25)
@@ -599,7 +599,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Selecteer een andere bestandsmap.
+        ///   Looks up a localized string similar to Selecteer een andere bestandsmap..
         /// </summary>
         public static string HydraulicBoundaryData_Select_Different_Folder_ToolTip {
             get {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -re8fc2b04b5fc0172bca8534e2638e1fcb2745b23 -r7cc21db0f41f78d479db05b506b198d2c6c5bd25
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e8fc2b04b5fc0172bca8534e2638e1fcb2745b23)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 7cc21db0f41f78d479db05b506b198d2c6c5bd25)
@@ -418,6 +418,6 @@
       <value>Selecteer andere bestandsmap...</value>
     </data>
     <data name="HydraulicBoundaryData_Select_Different_Folder_ToolTip" xml:space="preserve">
-      <value>Selecteer een andere bestandsmap</value>
+      <value>Selecteer een andere bestandsmap.</value>
     </data>
 </root>
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -r036d56b75195dfdc3b23c6ed734c0eee994226c5 -r7cc21db0f41f78d479db05b506b198d2c6c5bd25
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDataContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDataContextTreeNodeInfoTest.cs)	(revision 036d56b75195dfdc3b23c6ed734c0eee994226c5)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDataContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDataContextTreeNodeInfoTest.cs)	(revision 7cc21db0f41f78d479db05b506b198d2c6c5bd25)
@@ -61,6 +61,7 @@
     public class HydraulicBoundaryDataContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuImportHydraulicBoundaryDatabaseIndex = 0;
+        private const int contextMenuSelectDifferentFolderIndex = 1;
         private const int contextMenuCalculateAllIndexForNotLinkedHydraulicBoundaryData = 4;
         private const int contextMenuCalculateAllIndexForLinkedHydraulicBoundaryData = 5;
         private const int contextMenuClearIllustrationPointsIndexForNotLinkedHydraulicBoundaryData = 6;
@@ -257,6 +258,44 @@
         }
 
         [Test]
+        public void ContextMenuStrip_WithLinkedHydraulicBoundaryData_ContextMenuItemSelectDifferentFolder()
+        {
+            // Setup
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
+
+            LinkHydraulicBoundaryData(assessmentSection.HydraulicBoundaryData);
+
+            var context = new HydraulicBoundaryDataContext(assessmentSection.HydraulicBoundaryData, assessmentSection);
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                IGui gui = StubFactory.CreateGuiStub(mocks);
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub<IMainWindow>());
+                mocks.ReplayAll();
+
+                using (var plugin = new RiskeerPlugin())
+                {
+                    TreeNodeInfo info = GetInfo(plugin);
+
+                    plugin.Gui = gui;
+
+                    // Call
+                    using (ContextMenuStrip menu = info.ContextMenuStrip(context, null, treeViewControl))
+                    {
+                        Assert.AreEqual(13, menu.Items.Count);
+
+                        TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuSelectDifferentFolderIndex,
+                                                                      "Selecteer andere bestandsmap...",
+                                                                      "Selecteer een andere bestandsmap.",
+                                                                      RiskeerCommonFormsResources.GeneralFolderIcon);
+                    }
+                }
+            }
+        }
+
+        [Test]
         public void ForeColor_HydraulicBoundaryDatabaseNotLinked_ReturnDisabledColor()
         {
             // Setup