diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
index 3df14c23b..297a990ec 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
@@ -416,10 +416,6 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
       });
   }
 
-  public onTagsChanged(tags: Tag[]) {
-    this.activityForm.get('tags').setValue(tags);
-  }
-
   public onCloneActivity(aActivity: Activity) {
     this.router.navigate(['/portfolio', 'activities'], {
       queryParams: { activityId: aActivity.id, createDialog: true }
@@ -452,6 +448,10 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
       });
   }
 
+  public onTagsChanged(tags: Tag[]) {
+    this.activityForm.get('tags').setValue(tags);
+  }
+
   public onUpdateActivity(aActivity: Activity) {
     this.router.navigate(['/portfolio', 'activities'], {
       queryParams: { activityId: aActivity.id, editDialog: true }
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
index fdc0f8cdb..a20c9af7a 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -376,7 +376,6 @@
         <gf-tags-selector
           [tags]="activityForm.get('tags')?.value"
           [tagsAvailable]="tagsAvailable"
-          [withoutHint]="true"
           (tagsChanged)="onTagsChanged($event)"
         />
       </div>
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
index 0c47b0220..555fbc7aa 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
@@ -422,10 +422,6 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
     return isAfter(aDate, new Date(0));
   }
 
-  public onTagsChanged(tags: Tag[]) {
-    this.activityForm.get('tags').setValue(tags);
-  }
-
   public onCancel() {
     this.dialogRef.close();
   }
@@ -485,6 +481,10 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
     }
   }
 
+  public onTagsChanged(tags: Tag[]) {
+    this.activityForm.get('tags').setValue(tags);
+  }
+
   public ngOnDestroy() {
     this.unsubscribeSubject.next();
     this.unsubscribeSubject.complete();
diff --git a/libs/ui/src/lib/tags-selector/tags-selector.component.html b/libs/ui/src/lib/tags-selector/tags-selector.component.html
index b56f13c2e..55f8a39f2 100644
--- a/libs/ui/src/lib/tags-selector/tags-selector.component.html
+++ b/libs/ui/src/lib/tags-selector/tags-selector.component.html
@@ -1,8 +1,4 @@
-<mat-form-field
-  appearance="outline"
-  class="w-100"
-  [ngClass]="{ 'without-hint': this.withoutHint }"
->
+<mat-form-field appearance="outline" class="w-100 without-hint">
   <mat-label i18n>Tags</mat-label>
   <mat-chip-grid #tagsChipList>
     @for (tag of tagsSelected(); track tag.id) {
diff --git a/libs/ui/src/lib/tags-selector/tags-selector.component.ts b/libs/ui/src/lib/tags-selector/tags-selector.component.ts
index ab3b53c5c..317d736f5 100644
--- a/libs/ui/src/lib/tags-selector/tags-selector.component.ts
+++ b/libs/ui/src/lib/tags-selector/tags-selector.component.ts
@@ -44,7 +44,6 @@ import { BehaviorSubject, Subject, takeUntil } from 'rxjs';
 export class GfTagsSelectorComponent implements OnInit, OnDestroy {
   @Input() tags: Tag[];
   @Input() tagsAvailable: Tag[];
-  @Input() withoutHint: boolean;
 
   @Output() tagsChanged = new EventEmitter<Tag[]>();
 
@@ -63,6 +62,7 @@ export class GfTagsSelectorComponent implements OnInit, OnDestroy {
         this.tagsChanged.emit(this.tagsSelected());
       }
     });
+
     this.tagInputControl.valueChanges
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((value) => {
@@ -84,9 +84,11 @@ export class GfTagsSelectorComponent implements OnInit, OnDestroy {
     const tag = this.tagsAvailable.find(({ id }) => {
       return id === event.option.value;
     });
+
     this.tagsSelected.update((tags) => {
       return [...(tags ?? []), tag];
     });
+
     this.tagInput.nativeElement.value = '';
     this.tagInputControl.setValue(undefined);
   }
@@ -97,6 +99,7 @@ export class GfTagsSelectorComponent implements OnInit, OnDestroy {
         return id !== tag.id;
       });
     });
+
     this.updateFilters();
   }