diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index 171ad5a27b..8da50ada3c 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -82,6 +82,16 @@ void CSVRender::TerrainShapeMode::activate(CSVWidget::SceneToolbar* toolbar)
 
 void CSVRender::TerrainShapeMode::deactivate(CSVWidget::SceneToolbar* toolbar)
 {
+    if(mShapeBrushScenetool)
+    {
+        toolbar->removeTool (mShapeBrushScenetool);
+    }
+
+    if (mTerrainShapeSelection)
+    {
+        mTerrainShapeSelection.reset();
+    }
+
     EditMode::deactivate(toolbar);
 }