Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs
===================================================================
diff -u -rf4a7276cac4a5ca2648268ed42fa1fc53d45c1ac -rac582bc093c8a275cd9b5dc2148af313b5242062
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision f4a7276cac4a5ca2648268ed42fa1fc53d45c1ac)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision ac582bc093c8a275cd9b5dc2148af313b5242062)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing.Design;
-using System.Linq;
 using System.Linq.Expressions;
 using Core.Common.Base;
 using Core.Common.Base.Data;
@@ -159,10 +158,8 @@
 
         public IEnumerable<SelectableHydraulicBoundaryLocation> GetSelectableHydraulicBoundaryLocations()
         {
-            return data.AvailableHydraulicBoundaryLocations
-                       .Select(hbl => new SelectableHydraulicBoundaryLocation(hbl, StructureLocation))
-                       .OrderBy(hbl => hbl.Distance)
-                       .ThenBy(hbl => hbl.HydraulicBoundaryLocation.Id);
+            return SelectableHydraulicBoundaryLocationHelper.GetSortedSelectableHydraulicBoundaryLocations(
+                data.AvailableHydraulicBoundaryLocations, StructureLocation);
         }
 
         public abstract IEnumerable<TStructure> GetAvailableStructures();