diff --git a/layouts/404.html b/layouts/404.html
new file mode 100644
index 0000000..557eb01
--- /dev/null
+++ b/layouts/404.html
@@ -0,0 +1,6 @@
+{{ define "main" }}
+<h1 class="dynamic-title">404: Page not found</h1>
+<div class="content">
+  <blockquote class="prompt-danger"><p>{{ i18n "not_found.statement" }}</p></blockquote>
+</div>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/topbar.html b/layouts/partials/topbar.html
index c6582db..66be5a3 100644
--- a/layouts/partials/topbar.html
+++ b/layouts/partials/topbar.html
@@ -59,7 +59,7 @@
     <div id="topbar-title">
       {{ if eq .Layout "home" }}
         {{- .Site.Title -}}
-      {{ else if or (eq .Type "tabs") (eq .Kind "page") }}
+      {{ else if or (eq .Type "tabs") (eq .Kind "page") (eq .Kind "404") }}
         {{- T (printf "tabs.%s" (path.Base $url)) | default .Title -}}
       {{ else }}
         {{- T (printf "layout.%s" .Layout) | default (.Layout | title) -}}