diff --git a/src/components/CommentForm/CommentForm.module.css b/src/components/CommentForm/CommentForm.module.css
index 937487b65..ee9403ebb 100644
--- a/src/components/CommentForm/CommentForm.module.css
+++ b/src/components/CommentForm/CommentForm.module.css
@@ -1,8 +1,7 @@
 .FormHelpButton {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-    padding-top: var(--gap-m);
+    margin-right: auto;
 }
 
 .CommentFormWrapper {
diff --git a/src/components/CommentForm/CommentForm.tsx b/src/components/CommentForm/CommentForm.tsx
index 81aeeb875..f6ac519f5 100644
--- a/src/components/CommentForm/CommentForm.tsx
+++ b/src/components/CommentForm/CommentForm.tsx
@@ -89,11 +89,9 @@ export const CommentForm: React.FC<CommentFormProps> = ({
 
                 {nullable(focused, () => (
                     <FormActions>
-                        <FormAction left inline>
-                            <div className={s.FormHelpButton}>
-                                <HelpButton slug="comments" />
-                            </div>
-                        </FormAction>
+                        <div className={s.FormHelpButton}>
+                            <HelpButton slug="comments" />
+                        </div>
                         <FormAction right inline>
                             {nullable(!busy, () => (
                                 <Button text={tr('Cancel')} onClick={onCommentCancel} />
diff --git a/src/components/GoalActivityFeed.tsx b/src/components/GoalActivityFeed.tsx
index de162e069..e85b44000 100644
--- a/src/components/GoalActivityFeed.tsx
+++ b/src/components/GoalActivityFeed.tsx
@@ -175,7 +175,7 @@ export const GoalActivityFeed = forwardRef<HTMLDivElement, GoalActivityFeedProps
                         <GoalCommentCreateForm
                             goalId={goal.id}
                             stateId={goal.stateId}
-                            states={goal._isEditable ? goal.project?.flow.states : undefined}
+                            states={goal._isEditable || goal._isParticipant ? goal.project?.flow.states : undefined}
                             onSubmit={onGoalCommentCreate}
                         />
                     }
diff --git a/src/utils/db/createComment.ts b/src/utils/db/createComment.ts
index 3e23c0bbb..8dcd5380a 100644
--- a/src/utils/db/createComment.ts
+++ b/src/utils/db/createComment.ts
@@ -46,14 +46,16 @@ export const createComment = async ({
     if (!commentAuthor) return null;
     if (!actualGoal) return null;
 
-    const { _isEditable, _shortId } = addCalculatedGoalsFields(actualGoal, activityId, role);
+    const { _isEditable, _shortId, _isParticipant } = addCalculatedGoalsFields(actualGoal, activityId, role);
+
+    const canEdit = _isEditable || _isParticipant;
 
     const commentCreateOperation = prisma.comment.create({
         data: {
             description,
             activityId: commentAuthor.id,
             goalId,
-            stateId: _isEditable ? stateId : undefined,
+            stateId: canEdit ? stateId : undefined,
         },
         include: {
             activity: {
@@ -71,19 +73,19 @@ export const createComment = async ({
                       where: { id: goalId },
                       data: {
                           id: goalId,
-                          stateId: _isEditable ? pushState?.id : actualGoal.stateId,
+                          stateId: canEdit ? pushState?.id : actualGoal.stateId,
                           goalInCriteria: {
                               updateMany: {
                                   where: {
                                       id: { in: actualGoal.goalInCriteria.map(({ id }) => id) },
                                   },
                                   data: {
-                                      isDone: _isEditable && pushState?.type && pushState?.type === StateType.Completed,
+                                      isDone: canEdit && pushState?.type && pushState?.type === StateType.Completed,
                                   },
                               },
                           },
                           history:
-                              _isEditable && stateId && stateId !== actualGoal.stateId
+                              canEdit && stateId && stateId !== actualGoal.stateId
                                   ? {
                                         create: {
                                             subject: 'state',
@@ -110,7 +112,7 @@ export const createComment = async ({
 
     await updateProjectUpdatedAt(updatedGoal.projectId);
 
-    if (_isEditable && stateId && stateId !== updatedGoal.stateId) {
+    if (canEdit && stateId && stateId !== updatedGoal.stateId) {
         await recalculateCriteriaScore(updatedGoal.id).recalcLinkedGoalsScores().recalcAverageProjectScore().run();
     }