Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r25f8991baa582abbd9c4f056afbd2f745b67d6a6 -r87234360c430570d06bfa618b1b9a18a8d2b7219
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 25f8991baa582abbd9c4f056afbd2f745b67d6a6)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 87234360c430570d06bfa618b1b9a18a8d2b7219)
@@ -566,28 +566,27 @@
         private StrictContextMenuItem CreateUpdateStructureItem(StructuresCalculation<ClosingStructuresInput>[] calculations)
         {
             var contextMenuEnabled = true;
-            string toolTipText = RingtoetsCommonFormsResources.StructuresPlugin_CreateUpdateStructureItem_Update_all_calculations_with_Structure_Tooltip;
-            if (!calculations.Any())
+            string toolTipMessage = RingtoetsCommonFormsResources.StructuresPlugin_CreateUpdateStructureItem_Update_all_calculations_with_Structure_Tooltip;
+            IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculationsToUpdate = calculations
+                .Where(c => c.InputParameters.Structure != null && !c.InputParameters.IsStructureInputSynchronized)
+                .ToList();
+
+            if (!calculationsToUpdate.Any())
             {
                 contextMenuEnabled = false;
-                toolTipText = RingtoetsCommonFormsResources.CreateUpdateContextMenuItem_No_calculations_to_update_ToolTip;
+                toolTipMessage = RingtoetsCommonFormsResources.CreateUpdateContextMenuItem_No_calculations_to_update_ToolTip;
             }
-            else if (calculations.All(c => c.InputParameters.Structure == null))
-            {
-                contextMenuEnabled = false;
-                toolTipText = RingtoetsCommonFormsResources.StructuresPlugin_CreateUpdateStructureItem_No_calculations_with_Structure_Tooltip;
-            }
 
             return new StrictContextMenuItem(RingtoetsCommonFormsResources.StructuresPlugin_CreateUpdateStructureItem_Update_all_Structures,
-                                             toolTipText,
+                                             toolTipMessage,
                                              RingtoetsCommonFormsResources.UpdateItemIcon,
-                                             (o, args) => UpdateStructureDependentDataOfCalculation(calculations))
+                                             (o, args) => UpdateStructureDependentDataOfCalculations(calculations))
             {
                 Enabled = contextMenuEnabled
             };
         }
 
-        private void UpdateStructureDependentDataOfCalculation(IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations)
+        private void UpdateStructureDependentDataOfCalculations(IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations)
         {
             string message =
                 RingtoetsCommonFormsResources.StructuresPlugin_VerifyStructureUpdate_Confirm_calculation_outputs_cleared_when_updating_Structure_dependent_data;
@@ -789,16 +788,16 @@
 
         private StrictContextMenuItem CreateUpdateStructureItem(ClosingStructuresCalculationContext context)
         {
-            var isEnabled = true;
+            var contextMenuEnabled = true;
             string toolTipMessage = RingtoetsCommonFormsResources.StructuresPlugin_CreateUpdateStructureItem_Update_calculation_with_Structure_ToolTip;
             if (context.WrappedData.InputParameters.Structure == null)
             {
-                isEnabled = false;
+                contextMenuEnabled = false;
                 toolTipMessage = RingtoetsCommonFormsResources.StructuresPlugin_CreateUpdateStructureItem_No_Structure_ToolTip;
             }
             else if (context.WrappedData.InputParameters.IsStructureInputSynchronized)
             {
-                isEnabled = false;
+                contextMenuEnabled = false;
                 toolTipMessage = RingtoetsCommonFormsResources.CalculationItem_No_changes_to_update_ToolTip;
             }
 
@@ -808,7 +807,7 @@
                 RingtoetsCommonFormsResources.UpdateItemIcon,
                 (o, args) => UpdateStructureDependentDataOfCalculation(context.WrappedData))
             {
-                Enabled = isEnabled
+                Enabled = contextMenuEnabled
             };
         }