diff --git a/config.toml b/config.toml
index 9198a75..010f038 100644
--- a/config.toml
+++ b/config.toml
@@ -48,8 +48,8 @@ show_feed = true
 # Links used in the nav
 links = [
   {url = "https://codeberg.org/daudix/duckquill", name = "Repo"},
-  {url = "/demo", name = "Demo"},
-  {url = "/blog", name = "Blog"},
+  {url = "$BASE_URL/demo", name = "Demo"},
+  {url = "$BASE_URL/blog", name = "Blog"},
 ]
 
 [extra.footer]
diff --git a/templates/includes/nav.html b/templates/includes/nav.html
index b93b86c..d291593 100644
--- a/templates/includes/nav.html
+++ b/templates/includes/nav.html
@@ -1,17 +1,17 @@
 <nav class="nav">
   <div class="nav-container">
-    <a href="{{ config.base_url }}">{{ config.title }}</a>
+    <a href="{{ get_url(path='') }}">{{ config.title }}</a>
     <ul>
       {% for link in config.extra.nav.links %}
         <li>
-          <a href="{{ link.url }}">{{ link.name }}</a>
+          <a href="{{ link.url | safe | replace(from='$BASE_URL', to=get_url(path='')) | safe }}">{{ link.name }}</a>
         </li>
       {% endfor %}
       {% if config.extra.nav.show_feed %}
         <li>
-          <a href="{{ config.base_url }}/atom.xml">Feed</a>
+          <a href="{{ get_url(path='atom.xml') }}">Feed</a>
         </li>
       {% endif %}
     </ul>
   </div>
-</nav>
+</nav>
\ No newline at end of file