diff --git a/source/_includes/asides/component_navigation.html b/source/_includes/asides/component_navigation.html
index 0d33e833122..fef93e4373a 100644
--- a/source/_includes/asides/component_navigation.html
+++ b/source/_includes/asides/component_navigation.html
@@ -35,12 +35,16 @@
       {% endif %}
       scores {{page.ha_quality_scale}} on our <a href='/docs/quality_scale/'>quality scale</a>
     {%- endif -%}.
-
-    {% if page.ha_domain %}
-    You can find the source for this integration on <a href='https://github.com/home-assistant/core/tree/dev/homeassistant/components/{{ page.ha_domain }}'>GitHub</a>.
-    {%- endif -%}
   </div>
 
+  {% if page.ha_domain %}
+  <div class='section'>
+    <a href="https://github.com/home-assistant/core/tree/dev/homeassistant/components/{{ page.ha_domain }}" target="_blank"><i class="icon-github"></i> View source on GitHub</a><br />
+    <a href="https://github.com/home-assistant/core/issues?q=is%3Aissue+is%3Aopen+label%3A%22integration%3A+{{ page.ha_domain }}%22" target="_blank"><i class="icon-bug"></i> View known issues</a>
+  </div>
+  {%- endif -%}
+
+
   {%- if page.ha_category.first -%}
     <div class='section'>
     <h1 class="title delta">Categories</h1>