From 1384da4d7a888bcec631aac3652be22c457c7b07 Mon Sep 17 00:00:00 2001
From: PaddleStroke <pierrelouis.boyer@gmail.com>
Date: Wed, 4 Jun 2025 06:13:44 +0200
Subject: [PATCH] Sketcher: Fix #21646 (#21739)

---
 src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h   | 5 +++--
 src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h b/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h
index 95a0c79e58..e44b03df9e 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h
@@ -535,8 +535,6 @@ protected:
     {
         clearEdit();
 
-        ModeStateMachine::reset();
-
         for (auto& ac : sugConstraints) {
             ac.clear();
         }
@@ -546,6 +544,9 @@ protected:
         ShapeConstraints.clear();
 
         onReset();
+
+        ModeStateMachine::reset();
+
         applyCursor();
     }
 
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h
index 984fe7323f..9adb37d151 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h
@@ -679,6 +679,12 @@ private:
         }
     }
 
+    void onReset() override
+    {
+        thickness = 0.;
+        toolWidgetManager.resetControls();
+    }
+
 private:
     Base::Vector2d center, corner1, corner2, corner3, corner4, frameCorner1, frameCorner2,
         frameCorner3, frameCorner4, corner2Initial;