diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index ba80aeb07..ced6538a7 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -44,10 +44,10 @@ namespace CSVRender
 
             std::vector<std::pair<int, int>> getTerrainSelection() const;
 
-        protected:
-
             void update();
 
+        protected:
+
             void drawShapeSelection(const osg::ref_ptr<osg::Vec3Array> vertices);
             void drawTextureSelection(const osg::ref_ptr<osg::Vec3Array> vertices);
 
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index f4f5322e5..4d456a9af 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -112,12 +112,7 @@ void CSVRender::TerrainShapeMode::primaryEditPressed(const WorldspaceHitResult&
             selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, true);
         }
     }
-    if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
-    {
-        paged->resetAllAlteredHeights();
-        mTotalDiffY = 0;
-    }
+    clearTransientEdits();
 }
 
 void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult& hit)
@@ -214,28 +209,15 @@ void CSVRender::TerrainShapeMode::dragCompleted(const QPoint& pos)
 {
     if (mDragMode == InteractionType_PrimaryEdit)
     {
-        if (mIsEditing)
-        {
-            mTotalDiffY = 0;
-            mIsEditing = false;
-        }
-
         applyTerrainEditChanges();
-
-        if (CSVRender::PagedWorldspaceWidget *paged = dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
-            paged->resetAllAlteredHeights();
+        clearTransientEdits();
     }
 }
 
 
 void CSVRender::TerrainShapeMode::dragAborted()
 {
-    if (CSVRender::PagedWorldspaceWidget *paged =
-        dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
-    {
-        paged->resetAllAlteredHeights();
-        mTotalDiffY = 0;
-    }
+     clearTransientEdits();
 }
 
 void CSVRender::TerrainShapeMode::dragWheel (int diff, double speedFactor)
@@ -266,17 +248,22 @@ void CSVRender::TerrainShapeMode::sortAndLimitAlteredCells()
         if (passes > 2)
         {
             Log(Debug::Warning) << "Warning: User edit exceeds accepted slope steepness. Automatic limiting has failed, edit has been discarded.";
-            if (CSVRender::PagedWorldspaceWidget *paged =
-                dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
-            {
-                paged->resetAllAlteredHeights();
-                mAlteredCells.clear();
-                return;
-            }
+            clearTransientEdits();
+            return;
         }
     }
 }
 
+void CSVRender::TerrainShapeMode::clearTransientEdits()
+{
+    mTotalDiffY = 0;
+    mIsEditing = false;
+    mAlteredCells.clear();
+    if (CSVRender::PagedWorldspaceWidget *paged = dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+        paged->resetAllAlteredHeights();
+    mTerrainShapeSelection->update();
+}
+
 void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
 {
     CSMDoc::Document& document = getWorldspaceWidget().getDocument();
@@ -385,7 +372,7 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
         pushNormalsEditToCommand(landNormalsNew, document, landTable, cellId);
     }
     undoStack.endMacro();
-    mAlteredCells.clear();
+    clearTransientEdits();
 }
 
 float CSVRender::TerrainShapeMode::calculateBumpShape(float distance, int radius, float height)
@@ -498,6 +485,7 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair<int, int>
             }
         }
     }
+    mTerrainShapeSelection->update();
 }
 
 void CSVRender::TerrainShapeMode::setFlattenToolTargetHeight(const WorldspaceHitResult& hit)
diff --git a/apps/opencs/view/render/terrainshapemode.hpp b/apps/opencs/view/render/terrainshapemode.hpp
index 8e2a616c9..00218a63e 100644
--- a/apps/opencs/view/render/terrainshapemode.hpp
+++ b/apps/opencs/view/render/terrainshapemode.hpp
@@ -95,6 +95,9 @@ namespace CSVRender
             /// Remove duplicates and sort mAlteredCells, then limitAlteredHeights forward and reverse
             void sortAndLimitAlteredCells();
 
+            /// Reset everything in the current edit
+            void clearTransientEdits();
+
             /// Move pending alteredHeights changes to omwgame/omwaddon -data
             void applyTerrainEditChanges();