Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r3abbac9ec8a9e07a8655223a563e29a877b45031 -re8fc2b04b5fc0172bca8534e2638e1fcb2745b23
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3abbac9ec8a9e07a8655223a563e29a877b45031)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e8fc2b04b5fc0172bca8534e2638e1fcb2745b23)
@@ -554,6 +554,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to &amp;Selecteer ander HLCD bestand....
+        /// </summary>
+        public static string HydraulicBoundaryData_Connect_To_Different_Hlcd {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryData_Connect_To_Different_Hlcd", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Selecteer een ander HLCD bestand..
+        /// </summary>
+        public static string HydraulicBoundaryData_Connect_To_Different_Hlcd_ToolTip {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryData_Connect_To_Different_Hlcd_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to &amp;Selecteer HLCD bestand....
         /// </summary>
         public static string HydraulicBoundaryData_Connect_To_Hlcd {
@@ -572,6 +590,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Selecteer andere bestandsmap....
+        /// </summary>
+        public static string HydraulicBoundaryData_Select_Different_Folder {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryData_Select_Different_Folder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Selecteer een andere bestandsmap.
+        /// </summary>
+        public static string HydraulicBoundaryData_Select_Different_Folder_ToolTip {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryData_Select_Different_Folder_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Locatie van het HRD bestand..
         /// </summary>
         public static string HydraulicBoundaryDatabase_FilePath_Description {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r3abbac9ec8a9e07a8655223a563e29a877b45031 -re8fc2b04b5fc0172bca8534e2638e1fcb2745b23
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 3abbac9ec8a9e07a8655223a563e29a877b45031)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e8fc2b04b5fc0172bca8534e2638e1fcb2745b23)
@@ -408,4 +408,16 @@
     <data name="Worst_AssemblyResult_per_section_DisplayName" xml:space="preserve">
     <value>Slechtste duidingsklasse per deelvak</value>
   </data>
+    <data name="HydraulicBoundaryData_Connect_To_Different_Hlcd" xml:space="preserve">
+      <value>&amp;Selecteer ander HLCD bestand...</value>
+    </data>
+    <data name="HydraulicBoundaryData_Connect_To_Different_Hlcd_ToolTip" xml:space="preserve">
+      <value>Selecteer een ander HLCD bestand.</value>
+    </data>
+    <data name="HydraulicBoundaryData_Select_Different_Folder" xml:space="preserve">
+      <value>Selecteer andere bestandsmap...</value>
+    </data>
+    <data name="HydraulicBoundaryData_Select_Different_Folder_ToolTip" xml:space="preserve">
+      <value>Selecteer een andere bestandsmap</value>
+    </data>
 </root>
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r0ea33f3e21c7f737f578beb69b737d759139a042 -re8fc2b04b5fc0172bca8534e2638e1fcb2745b23
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 0ea33f3e21c7f737f578beb69b737d759139a042)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision e8fc2b04b5fc0172bca8534e2638e1fcb2745b23)
@@ -2462,10 +2462,31 @@
                 () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsForWaterLevelAndWaveHeightCalculations(nodeData.AssessmentSection));
 
             AssessmentSection assessmentSection = nodeData.AssessmentSection;
-            return builder.AddImportItem(RiskeerFormsResources.HydraulicBoundaryData_Connect_To_Hlcd,
-                                         RiskeerFormsResources.HydraulicBoundaryData_Connect_To_Hlcd_ToolTip,
-                                         RiskeerCommonFormsResources.DatabaseIcon)
-                          .AddSeparator()
+
+            if (nodeData.WrappedData.IsLinked())
+            {
+                var selectDirectoryItem = new StrictContextMenuItem(
+                    RiskeerFormsResources.HydraulicBoundaryData_Select_Different_Folder,
+                    RiskeerFormsResources.HydraulicBoundaryData_Select_Different_Folder_ToolTip,
+                    RiskeerCommonFormsResources.GeneralFolderIcon,
+                    (sender, args) =>
+                    {
+                        
+                    });
+                
+                builder.AddImportItem(RiskeerFormsResources.HydraulicBoundaryData_Connect_To_Different_Hlcd,
+                                      RiskeerFormsResources.HydraulicBoundaryData_Connect_To_Different_Hlcd_ToolTip,
+                                      RiskeerCommonFormsResources.DatabaseIcon)
+                       .AddCustomItem(selectDirectoryItem);
+            }
+            else
+            {
+                builder.AddImportItem(RiskeerFormsResources.HydraulicBoundaryData_Connect_To_Hlcd,
+                                      RiskeerFormsResources.HydraulicBoundaryData_Connect_To_Hlcd_ToolTip,
+                                      RiskeerCommonFormsResources.DatabaseIcon);
+            }
+
+            return builder.AddSeparator()
                           .AddExportItem()
                           .AddSeparator()
                           .AddCustomItem(calculateAllItem)