Index: src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs
===================================================================
diff -u -r598 -r607
--- src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs	(.../DSoilModelGeometryEditor.cs)	(revision 598)
+++ src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs	(.../DSoilModelGeometryEditor.cs)	(revision 607)
@@ -68,8 +68,13 @@
 
             //Next was commented out in Geotechnics plugin because RingToets doesn't need it anymore
             spatialEditor.RegisterShapeType(typeof(SurfaceLine2), typeof(DrawingSurfaceLine2));
+            
             //Next can not be moved to Geotechnics
             spatialEditor.RegisterShapeType(typeof(SosSoilLayer1D), typeof(DrawingSosSoilLayer1D));
+            // Make sure SoilLayer1D objects can not be selected so no improper property window will appear. 
+            // DSoilModel should only handle SOS-layers, not 1D-layers. But creating 1D-layers for a new project can not (yet) be prevented. 
+            var si = spatialEditor.GetShapeInfo(typeof(DrawingLayer));
+            si.AllowSelect = false;
             spatialEditor.RegisterShapeType(typeof(BoringLayer), typeof(DrawingBoringLayer));
             spatialEditor.MarginBottom = 55;
             spatialEditor.ShapeRemoved += spatialEditor_ShapeRemoved;
Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs
===================================================================
diff -u -r604 -r607
--- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 604)
+++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 607)
@@ -919,11 +919,10 @@
 
             // override SoilLayerControl which is registered in geotechnics plugin, replace with local SOSSoilLayerControl control
             mainForm.DynamicPropertyControl.ClearRegistrationsForType(typeof(SoilLayer1D));
-            mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => new SosSoilLayer1DControl(), typeof(SosSoilLayer1D), typeof(SoilLayer1D));
-            //#Bka: typeof(SoilLayer1D) should NOT be needed but without it it can now never find the proper control
-
             // override SoilProfile1DControl which is registered in geotechnics plugin, replace with local SOSSoilProfile1DControl control
             mainForm.DynamicPropertyControl.ClearRegistrationsForType(typeof(SoilProfile1D));
+
+            mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => new SosSoilLayer1DControl(), typeof(SosSoilLayer1D));
             mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => new SosSoilProfile1DControl(), typeof(SoilProfile1D), typeof(SosSoilLayer1D));
             mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => new SoilProfile1DLookup2DControl(), typeof(SoilProfile1DLookup2D));
             mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => new SoilProfile2DControl(), typeof(SoilProfile2D));