diff --git a/web/app/sketcher/tools/manager.js b/web/app/sketcher/tools/manager.js
index a56247b5..74857140 100644
--- a/web/app/sketcher/tools/manager.js
+++ b/web/app/sketcher/tools/manager.js
@@ -59,6 +59,7 @@ export class ToolManager {
   }
 
   takeControl(tool) {
+    this.tool.cleanup();
     this.switchTool(tool);
     this.tool.restart();
   }
@@ -69,7 +70,6 @@ export class ToolManager {
   }
 
   releaseControl() {
-    this.tool.cleanup();
     this.takeControl(this.defaultTool);
   }
 }
\ No newline at end of file