diff --git a/editor/src/components/canvas/controls/comment-popup.tsx b/editor/src/components/canvas/controls/comment-popup.tsx
index 157c7818eef5..1d9b6f249753 100644
--- a/editor/src/components/canvas/controls/comment-popup.tsx
+++ b/editor/src/components/canvas/controls/comment-popup.tsx
@@ -273,7 +273,8 @@ const CommentThread = React.memo(({ comment }: CommentThreadProps) => {
       return
     }
     resolveThread(thread)
-  }, [thread, resolveThread])
+    dispatch([switchEditorMode(EditorModes.commentMode(null, 'not-dragging'))])
+  }, [thread, resolveThread, dispatch])
 
   const onClickClose = React.useCallback(() => {
     dispatch([switchEditorMode(EditorModes.commentMode(null, 'not-dragging'))])