diff --git a/mayan/apps/tags/templates/tags/tag_widget.html b/mayan/apps/tags/templates/tags/tag_widget.html
new file mode 100644
index 0000000000..6f903cb7cd
--- /dev/null
+++ b/mayan/apps/tags/templates/tags/tag_widget.html
@@ -0,0 +1 @@
+<span class="label label-tag" style="background: {{ tag.color }}">{{ tag.label }}</span>
diff --git a/mayan/apps/tags/widgets.py b/mayan/apps/tags/widgets.py
index ebe8926938..1256993ec7 100644
--- a/mayan/apps/tags/widgets.py
+++ b/mayan/apps/tags/widgets.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django import forms
 from django.apps import apps
+from django.template.loader import render_to_string
 from django.utils.html import escape
 from django.utils.encoding import force_text
 from django.utils.html import format_html
@@ -58,8 +59,4 @@ def widget_document_tags(document, user):
 
 
 def widget_single_tag(tag):
-    return mark_safe(
-        '''
-            <span class="label label-tag" style="background: {}">{}</span>
-        '''.format(tag.color, escape(tag.label).replace(' ', '&nbsp;'))
-    )
+    return render_to_string('tags/tag_widget.html', {'tag': tag})