diff --git a/src/app/features/tag/tag-list/tag-list.component.scss b/src/app/features/tag/tag-list/tag-list.component.scss
index 6228cbcd2a..e7c073490e 100644
--- a/src/app/features/tag/tag-list/tag-list.component.scss
+++ b/src/app/features/tag/tag-list/tag-list.component.scss
@@ -10,7 +10,7 @@
   //margin-left: 50px;
   // Magic number to align icon with task text
   user-select: none;
-  margin: 0 0 ($s*.5) 52px;
+  margin: 0 0 ($s*.5) 4px;
 }
 
 .tags {
diff --git a/src/app/features/tasks/task/task.component.html b/src/app/features/tasks/task/task.component.html
index 88b0ff7e27..633935ebe1 100644
--- a/src/app/features/tasks/task/task.component.html
+++ b/src/app/features/tasks/task/task.component.html
@@ -83,16 +83,20 @@
         </div>
       </div>
 
-      <div #contentEditableOnClickEl
-           (editFinished)="updateTaskTitleIfChanged($event.isChanged, $event.newVal)"
-           [isResetAfterEdit]="true"
-           [value]="task.title"
-           class="task-title"
-           contentEditableOnClick
-           contenteditable="true"
-           tabindex="2"></div>
-      <div class="spacer"
-           style="width:10px; display: block; border-right-width: 1px; border-right-style: solid"></div>
+      <div class="title-and-tags-wrapper">
+        <div #contentEditableOnClickEl
+             (editFinished)="updateTaskTitleIfChanged($event.isChanged, $event.newVal)"
+             [isResetAfterEdit]="true"
+             [value]="task.title"
+             class="task-title"
+             contentEditableOnClick
+             contenteditable="true"
+             tabindex="2"></div>
+        <tag-list *ngIf="task.tagIds?.length && !task.parentId"
+                  [task]="task"></tag-list>
+        <div class="spacer"
+             style="width:10px; display: block; border-right-width: 1px; border-right-style: solid"></div>
+      </div>
     </div>
 
     <div class="all-controls-wrapper">
@@ -372,7 +376,7 @@
                   [matMenuTriggerFor]="projectMenu"
                   mat-menu-item>
             <mat-icon>forward</mat-icon>
-            {{(task.projectId ? T.F.TASK.CMP.MOVE_TO_OTHER_PROJECT : T.F.TASK.CMP.ADD_TO_PROJECT )|translate}}
+            {{(task.projectId ? T.F.TASK.CMP.MOVE_TO_OTHER_PROJECT : T.F.TASK.CMP.ADD_TO_PROJECT)|translate}}
           </button>
           <mat-menu #projectMenu="matMenu">
             <ng-container>
@@ -405,9 +409,6 @@
     </div>
   </div>
 
-  <tag-list *ngIf="task.tagIds?.length && !task.parentId"
-            [task]="task"></tag-list>
-
   <progress-bar *ngIf="isCurrent"
                 [cssClass]="'bg-accent'"
                 [progress]="progress"></progress-bar>
diff --git a/src/app/features/tasks/task/task.component.scss b/src/app/features/tasks/task/task.component.scss
index 6104ef6e2e..4cf2add9f3 100644
--- a/src/app/features/tasks/task/task.component.scss
+++ b/src/app/features/tasks/task/task.component.scss
@@ -334,6 +334,9 @@
 
 // OTHER UI ELEMENTS
 // -----------------
+.title-and-tags-wrapper {
+  flex-grow: 1;
+}
 
 // TASK TITLE
 .task-title {