diff --git a/web/core/components/issues/issue-detail/issue-activity/comments/comment-create.tsx b/web/core/components/issues/issue-detail/issue-activity/comments/comment-create.tsx
index 6cd9b61430..2c91a6c802 100644
--- a/web/core/components/issues/issue-detail/issue-activity/comments/comment-create.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/comments/comment-create.tsx
@@ -88,7 +88,7 @@ export const IssueCommentCreate: FC<TIssueCommentCreate> = (props) => {
         "-bottom-5": !peekIssue,
       })}
       onKeyDown={(e) => {
-        if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey && !e.metaKey && !isEmpty && editorRef.current?.isEditorReadyToDiscard())
+        if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey && !e.metaKey && !isEmpty && !isSubmitting && editorRef.current?.isEditorReadyToDiscard())
           handleSubmit(onSubmit)(e);
       }}
     >