diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index d609b3c..342bcc9 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -231,7 +231,9 @@
             </span>
               {% endif %}
               {% for tag in issue.tags %}
-                <span class="label label-info" style="background-color:{{tag.tag_color}}">{{tag.tag}}</span>
+                <span class="label label-info"
+                  style="background-color:{{tag.tag_color}}"
+                  title="{{ tag.tag_description or '' }}">{{tag.tag}}</span>
               {% endfor%}
             </td>
             <td class="td-open_date nowrap">
diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 45ccd12..5955328 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -765,7 +765,7 @@
               <span class="oi" data-glyph="tag"></span>&nbsp; {{ tag.tag }}
             </a>
             &nbsp<span class="label label-info" style="background-color:{{tag.tag_color}}">{{tag.tag}}</span>
-            &nbsp;<span class="text-muted">{{ tag.tag_description }}</span>
+            &nbsp;<span class="text-muted">{{ tag.tag_description or '' }}</span>
             <div class="pull-xs-right">
             <form class="icon del_icon pull-xs-right" method="POST"
               action="{{ url_for(