Index: src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs
===================================================================
diff -u -r87 -r101
--- src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs	(.../DSoilModelMapEditor.cs)	(revision 87)
+++ src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs	(.../DSoilModelMapEditor.cs)	(revision 101)
@@ -343,6 +343,13 @@
                     }
                 }
             }
+            if (sender == null)
+            {
+                if (segmentSplitters.Any())
+                {
+                    ClearSegmentSplitter();
+                }
+            }
         }
 
         private void DataEventPublisher_OnDataLisModified(object sender, PublishEventArgs e)
Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs
===================================================================
diff -u -r86 -r101
--- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 86)
+++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 101)
@@ -487,7 +487,7 @@
             // keep track of multiple selections for the purpose of saving a subset of soil segment data
             if (publishEventArgs.Objects == null || publishEventArgs.Objects.Length == 0)
             {
-                if (sender is IGeographic)
+                if (sender is IGeographic || sender is IHasGeographic)
                 {
                     selectedObjects.Clear();
                     selectedObjects.Add(sender);