diff --git a/app/src/Handlers/DirectoryHandler.php b/app/src/Handlers/DirectoryHandler.php
index 34d3885..57e9a75 100644
--- a/app/src/Handlers/DirectoryHandler.php
+++ b/app/src/Handlers/DirectoryHandler.php
@@ -58,6 +58,7 @@ class DirectoryHandler
             'files' => $files,
             'path' => $path,
             'readme' => $this->readme($files),
+            'title' => $path == '.' ? 'Home' : $path,
         ]);
     }
 
diff --git a/app/src/Handlers/SearchHandler.php b/app/src/Handlers/SearchHandler.php
index ae21b8c..8b67528 100644
--- a/app/src/Handlers/SearchHandler.php
+++ b/app/src/Handlers/SearchHandler.php
@@ -47,6 +47,7 @@ class SearchHandler
         return $this->view->render($response, 'index.twig', [
             'files' => $files,
             'search' => $search,
+            'title' => $search,
         ]);
     }
 }
diff --git a/app/views/layouts/app.twig b/app/views/layouts/app.twig
index 997916b..cb50f52 100644
--- a/app/views/layouts/app.twig
+++ b/app/views/layouts/app.twig
@@ -2,7 +2,7 @@
 
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-{# <base href="{{ base_href() }}"> #}
+
 <link rel="icon" href="{{ config('dark_mode') ? asset('images/favicon.dark.png') : asset('images/favicon.light.png') }}">
 <link rel="stylesheet" href="{{ asset('app.css') }}">
 
@@ -10,7 +10,7 @@
     {% include 'components/google-analytics.twig' %}
 {% endif %}
 
-<title>{{ path == '.' ? 'Home' : path }} &bull; Directory Lister</title>
+<title>{{ title }} &bull; Directory Lister</title>
 
 <div id="app" class="flex flex-col min-h-screen font-sans {{ config('dark_mode') ? 'dark-mode' : 'light-mode' }}">
     {% block content %}{% endblock %}