diff --git a/src/components/GoalPage/GoalPage.tsx b/src/components/GoalPage/GoalPage.tsx
index d2ef5b8f5..2de10bbb4 100644
--- a/src/components/GoalPage/GoalPage.tsx
+++ b/src/components/GoalPage/GoalPage.tsx
@@ -353,24 +353,6 @@ export const GoalPage = ({ user, ssrTime, params: { id } }: ExternalPageProps<{
                             feed={_activityFeed}
                             header={
                                 <>
-                                    {nullable(lastStateComment, (value) => (
-                                        <CommentView
-                                            pin
-                                            id={value.id}
-                                            author={value.activity?.user}
-                                            description={value.description}
-                                            state={value.state}
-                                            createdAt={value.createdAt}
-                                            reactions={value.reactions}
-                                            onSubmit={
-                                                value.activity?.id === user?.activityId
-                                                    ? onCommentUpdate(value.id)
-                                                    : undefined
-                                            }
-                                            onReactionToggle={onCommentReactionToggle(value.id)}
-                                            onDelete={onCommentDelete(value.id)}
-                                        />
-                                    ))}
                                     {nullable(goalAchiveCriteria.length || _isEditable, () => (
                                         <GoalCriteria
                                             goalId={id}
@@ -408,6 +390,25 @@ export const GoalPage = ({ user, ssrTime, params: { id } }: ExternalPageProps<{
                                             </GoalDependencyListByKind>
                                         )),
                                     )}
+
+                                    {nullable(lastStateComment, (value) => (
+                                        <CommentView
+                                            pin
+                                            id={value.id}
+                                            author={value.activity?.user}
+                                            description={value.description}
+                                            state={value.state}
+                                            createdAt={value.createdAt}
+                                            reactions={value.reactions}
+                                            onSubmit={
+                                                value.activity?.id === user?.activityId
+                                                    ? onCommentUpdate(value.id)
+                                                    : undefined
+                                            }
+                                            onReactionToggle={onCommentReactionToggle(value.id)}
+                                            onDelete={onCommentDelete(value.id)}
+                                        />
+                                    ))}
                                 </>
                             }
                             footer={
diff --git a/src/components/GoalPreview/GoalPreview.tsx b/src/components/GoalPreview/GoalPreview.tsx
index 3e876a3a1..4177f837c 100644
--- a/src/components/GoalPreview/GoalPreview.tsx
+++ b/src/components/GoalPreview/GoalPreview.tsx
@@ -315,24 +315,6 @@ export const GoalPreviewModal: React.FC<GoalPreviewProps> = ({ shortId, goal, de
                             feed={_activityFeed}
                             header={
                                 <>
-                                    {nullable(lastStateComment, (value) => (
-                                        <CommentView
-                                            pin
-                                            id={value.id}
-                                            author={value.activity?.user}
-                                            description={value.description}
-                                            state={value.state}
-                                            createdAt={value.createdAt}
-                                            reactions={value.reactions}
-                                            onSubmit={
-                                                value.activity?.id === user?.activityId
-                                                    ? onCommentUpdate(value.id)
-                                                    : undefined
-                                            }
-                                            onReactionToggle={onCommentReactionToggle(value.id)}
-                                            onDelete={onCommentDelete(value.id)}
-                                        />
-                                    ))}
                                     {nullable(goalAchiveCriteria.length || _isEditable, () => (
                                         <GoalCriteria
                                             goalId={id}
@@ -367,6 +349,25 @@ export const GoalPreviewModal: React.FC<GoalPreviewProps> = ({ shortId, goal, de
                                             </GoalDependencyListByKind>
                                         )),
                                     )}
+
+                                    {nullable(lastStateComment, (value) => (
+                                        <CommentView
+                                            pin
+                                            id={value.id}
+                                            author={value.activity?.user}
+                                            description={value.description}
+                                            state={value.state}
+                                            createdAt={value.createdAt}
+                                            reactions={value.reactions}
+                                            onSubmit={
+                                                value.activity?.id === user?.activityId
+                                                    ? onCommentUpdate(value.id)
+                                                    : undefined
+                                            }
+                                            onReactionToggle={onCommentReactionToggle(value.id)}
+                                            onDelete={onCommentDelete(value.id)}
+                                        />
+                                    ))}
                                 </>
                             }
                             footer={