diff --git a/site/content/404.md b/site/content/404.md
index cf32490206..de003f1490 100644
--- a/site/content/404.md
+++ b/site/content/404.md
@@ -1,5 +1,6 @@
 ---
 title: "404 - File not found"
+layout: 404
 description: ""
 url: /404.html
 robots: noindex,follow
diff --git a/site/layouts/_default/404.html b/site/layouts/_default/404.html
new file mode 100644
index 0000000000..80234d4349
--- /dev/null
+++ b/site/layouts/_default/404.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    {{ partial "header" . }}
+  </head>
+  <body>
+    {{ partial "skippy" . }}
+
+    {{ partial "docs-navbar" . }}
+
+    <main class="bd-content p-5" id="content" role="main">
+      {{ .Content }}
+    </main>
+
+    {{ partial "footer" . }}
+    {{ partial "scripts" . }}
+  </body>
+</html>
