diff --git a/frontend/app/framework/angular/forms/editors/tag-editor.component.scss b/frontend/app/framework/angular/forms/editors/tag-editor.component.scss
index 2c2e14fbf..cc935e881 100644
--- a/frontend/app/framework/angular/forms/editors/tag-editor.component.scss
+++ b/frontend/app/framework/angular/forms/editors/tag-editor.component.scss
@@ -57,6 +57,10 @@ $inner-height: 1.75rem;
             display: none !important;
         }
 
+        .item {
+            padding-right: .5rem;
+        }
+
         .icon-close {
             display: none !important;
         }
diff --git a/frontend/app/shared/components/assets/asset.component.html b/frontend/app/shared/components/assets/asset.component.html
index 2ae2f7f5a..7ba470458 100644
--- a/frontend/app/shared/components/assets/asset.component.html
+++ b/frontend/app/shared/components/assets/asset.component.html
@@ -141,8 +141,8 @@
                         </td>
                     </ng-container>
 
-                    <td class="col-actions text-right" *ngIf="!isDisabled">
-                        <button type="button" class="btn btn-text-danger" *ngIf="!removeMode && asset.canDelete"
+                    <td class="col-actions text-right">
+                        <button type="button" class="btn btn-text-danger" *ngIf="!removeMode && asset.canDelete" [disabled]="isDisabled"
                             (sqxConfirmClick)="delete.emit()"
                             confirmTitle="i18n:assets.deleteConfirmTitle"
                             confirmText="i18n:assets.deleteConfirmText"
@@ -150,7 +150,7 @@
                             <i class="icon-bin2"></i>
                         </button>
 
-                        <button type="button" class="btn btn-text-secondary" *ngIf="removeMode"
+                        <button type="button" class="btn btn-text-secondary" *ngIf="removeMode" [disabled]="isDisabled"
                             (sqxConfirmClick)="remove.emit()"
                             confirmTitle="i18n:assets.removeConfirmTitle"
                             confirmText="i18n:assets.removeConfirmText"