diff --git a/core/gesture.ts b/core/gesture.ts
index fa3d8a15138..ecb8c8da8f4 100644
--- a/core/gesture.ts
+++ b/core/gesture.ts
@@ -777,13 +777,11 @@ export class Gesture {
     this.setStartWorkspace(ws);
     this.mostRecentEvent = e;
 
-    if (!this.startBlock && !this.startBubble && !this.startComment) {
+    if (!this.targetBlock && !this.startBubble && !this.startComment) {
       // Ensure the workspace is selected if nothing else should be. Note that
       // this is focusNode() instead of focusTree() because if any active node
       // is focused in the workspace it should be defocused.
       getFocusManager().focusNode(ws);
-    } else if (this.startBlock) {
-      getFocusManager().focusNode(this.startBlock);
     }
 
     this.doStart(e);