diff --git a/src/viewport-three/viewport-host.ts b/src/viewport-three/viewport-host.ts
index 683de91c..a16b8e0c 100644
--- a/src/viewport-three/viewport-host.ts
+++ b/src/viewport-three/viewport-host.ts
@@ -253,6 +253,8 @@ export class ViewportHost {
 
   setToolMode(toolMode: ToolMode) {
     this.toolMode = toolMode;
+    this.lastClickPointer = null;
+    this.lastClickSelectionKey = null;
 
     if (toolMode !== "box-create") {
       this.setBoxCreatePreview(null);