diff --git a/mayan/apps/appearance/static/appearance/css/base.css b/mayan/apps/appearance/static/appearance/css/base.css
index 66ae55c1fd..7c2e972208 100644
--- a/mayan/apps/appearance/static/appearance/css/base.css
+++ b/mayan/apps/appearance/static/appearance/css/base.css
@@ -163,3 +163,7 @@ a i {
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
     padding-bottom: 1px;
 }
+
+.tag-container .label {
+    margin-right: 2px;
+}
diff --git a/mayan/apps/tags/widgets.py b/mayan/apps/tags/widgets.py
index 94cb926edb..ebe8926938 100644
--- a/mayan/apps/tags/widgets.py
+++ b/mayan/apps/tags/widgets.py
@@ -43,16 +43,18 @@ def widget_document_tags(document, user):
         app_label='acls', model_name='AccessControlList'
     )
 
-    tags_template = []
+    result = ['<div class="tag-container">']
 
     tags = AccessControlList.objects.filter_by_access(
         permission_tag_view, user, queryset=document.attached_tags().all()
     )
 
     for tag in tags:
-        tags_template.append(widget_single_tag(tag))
+        result.append(widget_single_tag(tag))
 
-    return mark_safe(''.join(tags_template))
+    result.append('</div>')
+
+    return mark_safe(''.join(result))
 
 
 def widget_single_tag(tag):