diff --git a/client/static/js/annotation-editor.js b/client/static/js/annotation-editor.js
index 44c7c67..7d3baed 100644
--- a/client/static/js/annotation-editor.js
+++ b/client/static/js/annotation-editor.js
@@ -526,12 +526,19 @@ function annotationEditor() {
         this.canvas.defaultCursor = 'default';
         this.canvas.forEachObject(function (o) {
           o.selectable = true;
+          o.evented = true;
+          o.hasControls = true;
+          o.hasBorders = true;
         });
       } else {
-        // marker, arrow, rect
+        // marker, arrow, rect — disable object interaction during drawing
         this.canvas.selection = false;
         this.canvas.defaultCursor = 'crosshair';
         this.canvas.discardActiveObject();
+        this.canvas.forEachObject(function (o) {
+          o.selectable = false;
+          o.evented = false;
+        });
       }
 
       this.canvas.renderAll();
diff --git a/client/templates/maker/task_drawing.html b/client/templates/maker/task_drawing.html
index 8fc348a..0700828 100644
--- a/client/templates/maker/task_drawing.html
+++ b/client/templates/maker/task_drawing.html
@@ -353,7 +353,7 @@
 <script>
   pdfjsLib.GlobalWorkerOptions.workerSrc = 'https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.11.174/pdf.worker.min.js';
 </script>
-<script src="{{ url_for('static', filename='js/annotation-editor.js') }}?v=9"></script>
+<script src="{{ url_for('static', filename='js/annotation-editor.js') }}?v=10"></script>
 <script>
 function taskDrawing() {
   const taskData = window.__taskData || {};