diff --git a/source/_includes/asides/categories.html b/source/_includes/asides/categories.html
index 8d600335bfb..dbf5fd7ae74 100644
--- a/source/_includes/asides/categories.html
+++ b/source/_includes/asides/categories.html
@@ -1,7 +1,7 @@
 <section class="aside-module grid__item one-whole lap-one-half">
   <h1 class="title delta">Categories</h1>
   <ul class="divided">
-    {% assign categories = site.categories | sort %}
+    {% assign categories = site.categories | sort_natural %}
     {% for category in categories %}
       <li><a href="/blog/categories/{{ category | first | downcase }}/">{{ category | first | replace: '-', ' '}}</a></li>
     {% endfor %}
diff --git a/source/_includes/asides/component_navigation.html b/source/_includes/asides/component_navigation.html
index 56ba92ee777..62791497419 100644
--- a/source/_includes/asides/component_navigation.html
+++ b/source/_includes/asides/component_navigation.html
@@ -1,4 +1,4 @@
-{% assign components = site.components | sort: 'title' %}
+{% assign components = site.components | sort_natural: 'title' %}
 {% assign github_main_repo = 'https://github.com/home-assistant/home-assistant/blob/master/homeassistant' %}
 <section class="aside-module grid__item one-whole lap-one-half">
   {% include edit_github.html %}
diff --git a/source/_includes/asides/cookbook_navigation.html b/source/_includes/asides/cookbook_navigation.html
index 7b6287c0565..46fe38558c1 100644
--- a/source/_includes/asides/cookbook_navigation.html
+++ b/source/_includes/asides/cookbook_navigation.html
@@ -1,6 +1,6 @@
 <section class="aside-module grid__item one-whole lap-one-half">
   {% include edit_github.html %}
-  {% assign cookbook = site.cookbook | sort: 'title' %}
+  {% assign cookbook = site.cookbook | sort_natural: 'title' %}
 
   <div class='section'>
     <a href='/cookbook'>Back to the cookbook</a>
diff --git a/source/_includes/asides/faq_navigation.html b/source/_includes/asides/faq_navigation.html
index 68ccac63ebd..65221d5ee22 100644
--- a/source/_includes/asides/faq_navigation.html
+++ b/source/_includes/asides/faq_navigation.html
@@ -2,8 +2,8 @@
   <div class='section'>
     <h1 class="title delta">Entries</h1>
     <ul class='divided sidebar-menu'>
-{% assign faq = site.faq | sort: 'title' %}
-{% assign categories = faq | map: 'ha_category' | uniq | sort %}
+{% assign faq = site.faq | sort_natural: 'title' %}
+{% assign categories = faq | map: 'ha_category' | uniq | sort_natural %}
 
 {% for category in categories %}
       <li>
diff --git a/source/_includes/asides/lovelace_navigation.html b/source/_includes/asides/lovelace_navigation.html
index d8eab73833b..cc5a8d7d4d7 100644
--- a/source/_includes/asides/lovelace_navigation.html
+++ b/source/_includes/asides/lovelace_navigation.html
@@ -1,6 +1,6 @@
 <section class="aside-module grid__item one-whole lap-one-half">
   <!-- {% include edit_github.html %} -->
-  {% assign cards = site.lovelace | sort: 'title' %}
+  {% assign cards = site.lovelace | sort_natural: 'title' %}
 
   <div class='section'>
     <h1 class="title delta">Lovelace UI</h1>