diff --git a/app/scenes/Document/components/CommentThread.tsx b/app/scenes/Document/components/CommentThread.tsx
index 8d7830d27..21f3775b7 100644
--- a/app/scenes/Document/components/CommentThread.tsx
+++ b/app/scenes/Document/components/CommentThread.tsx
@@ -68,7 +68,9 @@ function CommentThread({
     comment: thread,
   });
 
-  const commentsInThread = comments.inThread(thread.id);
+  const commentsInThread = comments
+    .inThread(thread.id)
+    .filter((comment) => !comment.isNew);
 
   useOnClickOutside(topRef, (event) => {
     if (
@@ -180,7 +182,7 @@ function CommentThread({
           },
         }}
       >
-        {focused && (
+        {(focused || commentsInThread.length === 0) && (
           <Fade timing={100}>
             <CommentForm
               documentId={document.id}
diff --git a/app/stores/CommentsStore.ts b/app/stores/CommentsStore.ts
index f86723c0b..275ecb78a 100644
--- a/app/stores/CommentsStore.ts
+++ b/app/stores/CommentsStore.ts
@@ -38,8 +38,7 @@ export default class CommentsStore extends BaseStore<Comment> {
     return filter(
       this.orderedData,
       (comment) =>
-        comment.parentCommentId === threadId ||
-        (comment.id === threadId && !comment.isNew)
+        comment.parentCommentId === threadId || comment.id === threadId
     );
   }