diff --git a/core/bubbles/bubble.ts b/core/bubbles/bubble.ts
index 35b9e7dde..e86f5a856 100644
--- a/core/bubbles/bubble.ts
+++ b/core/bubbles/bubble.ts
@@ -212,9 +212,10 @@ export abstract class Bubble implements IBubble, ISelectable {
     this.background.setAttribute('fill', colour);
   }
 
-  /** Passes the pointer event off to the gesture system. */
+  /** Brings the bubble to the front and passes the pointer event off to the gesture system. */
   private onMouseDown(e: PointerEvent) {
     this.workspace.getGesture(e)?.handleBubbleStart(e, this);
+    this.bringToFront();
     common.setSelected(this);
   }
 
diff --git a/core/comments/rendered_workspace_comment.ts b/core/comments/rendered_workspace_comment.ts
index 79caf6a1d..7cc643808 100644
--- a/core/comments/rendered_workspace_comment.ts
+++ b/core/comments/rendered_workspace_comment.ts
@@ -28,6 +28,7 @@ import {
 import {IContextMenu} from '../interfaces/i_contextmenu.js';
 import * as contextMenu from '../contextmenu.js';
 import {ContextMenuRegistry} from '../contextmenu_registry.js';
+import * as layers from '../layers.js';
 
 export class RenderedWorkspaceComment
   extends WorkspaceComment
@@ -208,6 +209,7 @@ export class RenderedWorkspaceComment
     const gesture = this.workspace.getGesture(e);
     if (gesture) {
       gesture.handleCommentStart(e, this);
+      this.workspace.getLayerManager()?.append(this, layers.BLOCK);
       common.setSelected(this);
     }
   }