diff --git a/WASMSerialTerminal/App.razor b/WASMSerialTerminal/App.razor
index d104a95..51c44dc 100644
--- a/WASMSerialTerminal/App.razor
+++ b/WASMSerialTerminal/App.razor
@@ -1,4 +1,6 @@
-﻿<Router AppAssembly="@typeof(App).Assembly">
+﻿@inject NavigationManager NavManager
+
+<Router AppAssembly="@typeof(App).Assembly">
 	<Found Context="routeData">
 		@* If the web serial API is supported, then we can render the regular content *@
 		<WebSerialSupportChecker>
@@ -7,9 +9,10 @@
 		</WebSerialSupportChecker>
 	</Found>
 	<NotFound>
-		<PageTitle>Not found</PageTitle>
+		@{ NavManager.NavigateTo("", false, true); }
+		<PageTitle>WASM Serial Terminal</PageTitle>
 		<LayoutView Layout="@typeof(MainLayout)">
-			<p role="alert">Sorry, there's nothing at this address.</p>
+			<p role="alert">Sorry, there's nothing at this address. Redirecting you to the main page...</p>
 		</LayoutView>
 	</NotFound>
 </Router>
\ No newline at end of file
diff --git a/WASMSerialTerminal/wwwroot/404.html b/WASMSerialTerminal/wwwroot/404.html
index 1877878..ebb33fb 100644
--- a/WASMSerialTerminal/wwwroot/404.html
+++ b/WASMSerialTerminal/wwwroot/404.html
@@ -1,13 +1,14 @@
 ﻿<!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8" />
-        <title>WASM Serial Terminal</title>
-        <!-- If the user has put in extra junk on the URL, clear it and redirect users to the app page. For github pages only. -->
-        <script type="text/javascript">
-            window.location = window.location.split("/").slice(0, 4);
-        </script>
-    </head>
-    <body>
-    </body>
+	<head>
+		<meta charset="utf-8" />
+		<title>WASM Serial Terminal</title>
+		<!-- If the user has put extra junk on the URL, clear it and redirect them to the app page. For github pages first request. -->
+		<!-- Redirects are also handled by App.razor if 404.html isn't reached -->
+		<script type="text/javascript">
+			window.location = window.location.toString().split("/").slice(0, 4).join("/");
+		</script>
+	</head>
+	<body>
+	</body>
 </html>
\ No newline at end of file
