diff --git a/src/helpers/Page.php b/src/helpers/Page.php
index fe2a64d..59d95fc 100755
--- a/src/helpers/Page.php
+++ b/src/helpers/Page.php
@@ -85,6 +85,7 @@ class Page {
                     'login' => $issue['user']['login']
                 ),
                 'created_at' => $issue['created_at'],
+                'labels' => $issue['labels']
             );
         }
 
diff --git a/src/templates/issue.twig b/src/templates/issue.twig
index 5f93c9b..fe75503 100755
--- a/src/templates/issue.twig
+++ b/src/templates/issue.twig
@@ -9,16 +9,11 @@
     <div class="container">
         <div class="page-header">
             <h1>{{ title }}
-                <a href="https://github.com/{{ githubOrganization }}/{{ githubRepository }}/issues/{{ number }}">
+                <a href="{{ html_url }}">
                     <small>#{{ number }}</small>
                 </a>
             </h1>
-            {% if labels and labels|length %}
-                {% for label in labels %}
-                    <span class="badge text-{{ label.color | textcolor }}"
-                          style="background: {{ '#' ~ label.color }}">{{ label.name }}</span>
-                {% endfor %}
-            {% endif %}
+            {{ macro.labels(labels) }}
 
             {% if milestone %}
                 <span class="badge badge-secondary" title="{{ milestone.description }}">{{ milestone.title }}</span>
diff --git a/src/templates/macros.twig b/src/templates/macros.twig
index f84145e..16f77b0 100755
--- a/src/templates/macros.twig
+++ b/src/templates/macros.twig
@@ -3,4 +3,13 @@
         <img class="avatar" src="{{ user.avatar_url }}&s=44" role="presentation" aria-hidden="true" width="44"
              height="44">@{{ user.login }}
     </a>
+{% endmacro %}
+
+{% macro labels(labels) %}
+    {% if labels and labels|length %}
+        {% for label in labels %}
+            <span class="badge text-{{ label.color | textcolor }}"
+                  style="background: {{ '#' ~ label.color }}">{{ label.name }}</span>
+        {% endfor %}
+    {% endif %}
 {% endmacro %}
\ No newline at end of file
diff --git a/src/templates/page.twig b/src/templates/page.twig
index c47bd30..eafea17 100644
--- a/src/templates/page.twig
+++ b/src/templates/page.twig
@@ -1,4 +1,5 @@
 {% extends "layout.twig" %}
+{% import "macros.twig" as macro %}
 
 {% block head %}
     {% if currentPage > 1 %}
@@ -45,6 +46,7 @@
                                 {% if issue.state == 'closed' %}
                                     <span class="badge badge-secondary">closed</span>
                                 {% endif %}
+                                {{ macro.labels(issue.labels) }}
                             </small>
                         </div>
                     </a>