diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index b32d717..c3a116a 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -42,7 +42,7 @@
         <i class="fa-fw {{ tab.icon }} ml-xl-3 mr-xl-3 unloaded"></i>
         {% capture tab_name %}{{ tab.url | split: '/' }}{% endcapture %}
 
-        <span>{{ site.data.locales[lang].tabs.[tab_name] | default: tab_name | upcase }}</span>
+        <span>{{ site.data.locales[lang].tabs.[tab_name] | default: tab.title | upcase }}</span>
       </a>
     </li> <!-- .nav-item -->
     {% endfor %}
diff --git a/_includes/topbar.html b/_includes/topbar.html
index 6ecc176..051b12b 100644
--- a/_includes/topbar.html
+++ b/_includes/topbar.html
@@ -31,16 +31,12 @@
             <span>{{ page.title }}</span>
           {% endif %}
 
-        {% else %}
-
-          {% unless page.layout == 'post' %}
-            <span>
-              <a href="{{ item | relative_url }}">
-                {{ site.data.locales[lang].tabs[item] | default: page.title }}
-              </a>
-            </span>
-          {% endunless %}
-
+        {% elsif page.layout == 'category' or page.layout == 'tag' %}
+          <span>
+            <a href="{{ item | relative_url }}">
+              {{ site.data.locales[lang].tabs[item] | default: page.title }}
+            </a>
+          </span>
         {% endif %}
 
       {% endfor %}