diff --git a/src/frontend/app/tag/indexing/tag-input.component.html b/src/frontend/app/tag/indexing/tag-input.component.html
index 3f5b52c12bc8bcda763d6c4da69e2931b77286c3..59b8118611a905837975e9b1fe3c7415a20f168c 100644
--- a/src/frontend/app/tag/indexing/tag-input.component.html
+++ b/src/frontend/app/tag/indexing/tag-input.component.html
@@ -5,7 +5,7 @@
         <input type="text" #autoCompleteInput [placeholder]="lang.searchTag" matInput [formControl]="myControl"
             [matAutocomplete]="auto" (click)="$event.stopPropagation()" (focus)="resetAutocomplete()">
         <button [disabled]="!canAdd" type="button" matSuffix mat-icon-button (click)="addItem()">
-            <mat-icon class="fa fa-plus" [title]="lang.add" [style.visibility]="canAdd ? 'visible' : 'hidden'"></mat-icon>
+            <mat-icon class="fa fa-plus" [title]="lang.add" [style.visibility]="canAdd && myControl.value.length > 0 ? 'visible' : 'hidden'"></mat-icon>
         </button>
         <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selectOpt($event)">
             <ng-container *ngIf="options.length > 0 && !loading">
diff --git a/src/frontend/app/tag/indexing/tag-input.component.ts b/src/frontend/app/tag/indexing/tag-input.component.ts
index 6730b4dd56874757e920f2115a10e4d8e0374cbd..f86ca766b44cffeffbccd37091f15ad81e418c86 100644
--- a/src/frontend/app/tag/indexing/tag-input.component.ts
+++ b/src/frontend/app/tag/indexing/tag-input.component.ts
@@ -60,6 +60,11 @@ export class TagInputComponent implements OnInit {
 
     ngOnInit() {
         this.controlAutocomplete.setValue(this.controlAutocomplete.value === null || this.controlAutocomplete.value === '' ? [] : this.controlAutocomplete.value);
+        this.http.get('../../rest/currentUser/privileges').pipe(
+            tap((data: any) => {
+                this.canAdd = data.privileges.canManageTags;
+            })
+        ).subscribe();
         this.initFormValue();
         this.initAutocompleteRoute();
     }
@@ -69,7 +74,7 @@ export class TagInputComponent implements OnInit {
         this.options = [];
         this.myControl.valueChanges
             .pipe(
-                tap((value) => this.canAdd = value.length === 0 ? false : true),
+                //tap((value) => this.canAdd = value.length === 0 ? false : true),
                 debounceTime(300),
                 filter(value => value.length > 2),
                 distinctUntilChanged(),