diff --git a/core/comments/rendered_workspace_comment.ts b/core/comments/rendered_workspace_comment.ts
index b37c125e1..a70d5621e 100644
--- a/core/comments/rendered_workspace_comment.ts
+++ b/core/comments/rendered_workspace_comment.ts
@@ -147,7 +147,6 @@ export class RenderedWorkspaceComment
   override moveTo(location: Coordinate, reason?: string[] | undefined): void {
     super.moveTo(location, reason);
     this.view.moveTo(location);
-    this.snapToGrid();
   }
 
   /**
@@ -218,7 +217,6 @@ export class RenderedWorkspaceComment
 
   /** Ends the drag on the comment. */
   endDrag(): void {
-    this.snapToGrid();
     this.dragStrategy.endDrag();
   }
 
diff --git a/core/dragging/comment_drag_strategy.ts b/core/dragging/comment_drag_strategy.ts
index 5fe5e356c..804ad2e9c 100644
--- a/core/dragging/comment_drag_strategy.ts
+++ b/core/dragging/comment_drag_strategy.ts
@@ -42,13 +42,15 @@ export class CommentDragStrategy implements IDragStrategy {
   endDrag(): void {
     this.fireMoveEvent();
 
-    this.workspace.setResizesEnabled(true);
-    eventUtils.setGroup(false);
-
     this.workspace
       .getLayerManager()
       ?.moveOffDragLayer(this.comment, layers.BLOCK);
     this.comment.setDragging(false);
+
+    this.comment.snapToGrid();
+
+    this.workspace.setResizesEnabled(true);
+    eventUtils.setGroup(false);
   }
 
   private fireMoveEvent() {