diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.html b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
index 0182e0228cb29f02e9d9ec2e2969dd0314e3b7ea..28bc0b2f073280ed447ce270c3376c0c7658d923 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
@@ -32,12 +32,31 @@
       </mat-tab>
     </mat-tab-group>
   </ars-row>
-  <ars-row>
-    <app-dialog-action-buttons
-      buttonsLabelSection="comment-page"
-      confirmButtonLabel="send"
-      [cancelButtonClickAction]="buildCloseDialogActionCallback()"
-      [confirmButtonClickAction]="buildCreateCommentActionCallback(commentBody)"
-    ></app-dialog-action-buttons>
+  <ars-row style="margin-top:8px">
+    <mat-divider></mat-divider>
+  </ars-row>
+  <ars-row ars-flex-box>
+    <ars-col>
+      <mat-form-field *ngIf="tags" class="tag-form-field">
+        <mat-label>{{'comment-page.tag' | translate}}</mat-label>
+        <mat-select [(ngModel)]="selectedTag" class="tag-select">
+          <mat-option *ngFor="let tag of tags" value="{{tag}}">
+            {{tag}}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+    </ars-col>
+    <ars-fill>
+    </ars-fill>
+    <ars-col>
+      <app-dialog-action-buttons
+        buttonsLabelSection="comment-page"
+        confirmButtonLabel="send"
+        [showDivider]="false"
+        [spacing]="false"
+        [cancelButtonClickAction]="buildCloseDialogActionCallback()"
+        [confirmButtonClickAction]="buildCreateCommentActionCallback(commentBody)"
+      ></app-dialog-action-buttons>
+    </ars-col>
   </ars-row>
 </ars-row>
diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
index 3afb28f7320f6661e0d42126f9bbd1fd14129f53..95a19bea3014705b899a413a93392c6b83283b5c 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
@@ -38,6 +38,15 @@ mat-hint {
   color: var(--on-surface);
 }
 
+.tag-form-field{
+  @media screen and (max-width:500px) {
+    width:40px;
+  }
+}
+
+.tag-select{
+}
+
 ::ng-deep .mat-form-field-label {
   color: var(--on-surface)!important;
 }
diff --git a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html
index 8b5494962b54b0a409318c97e14bb75ec7b2027c..b6f5537ac46925ecea1602b1e8a67d60def00632 100644
--- a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html
+++ b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html
@@ -2,7 +2,7 @@
   'dialog-action-buttons': true,
   'no-spacing': (spacing === false)
 }">
-  <mat-divider></mat-divider>
+  <mat-divider *ngIf="showDivider"></mat-divider>
   <div fxLayoutAlign="end">
     <div fxLayout="row-reverse" fxLayoutGap="10px" class="buttons">
       <button
diff --git a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.ts b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.ts
index 0a0d9c915404a2ebe4016a4aebff7a3392e38236..2ca544872fd4243fc2968515ca99c1a27de780bb 100644
--- a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.ts
+++ b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.ts
@@ -16,6 +16,8 @@ export enum DialogConfirmActionButtonType {
 })
 export class DialogActionButtonsComponent implements OnInit {
 
+  @Input() showDivider = true;
+
   /**
    * The button labels section.
    */