diff --git a/src/main/index.html.ejs b/src/main/index.html.ejs
index 0153a0c..7c6a194 100644
--- a/src/main/index.html.ejs
+++ b/src/main/index.html.ejs
@@ -4,6 +4,30 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <title>BB Datastore Playground</title>
+        <!-- Start Single Page Apps for GitHub Pages -->
+        <script type="text/javascript">
+          // Single Page Apps for GitHub Pages
+          // MIT License
+          // https://github.com/rafgraph/spa-github-pages
+          // This script checks to see if a redirect is present in the query string,
+          // converts it back into the correct url and adds it to the
+          // browser's history using window.history.replaceState(...),
+          // which won't cause the browser to attempt to load the new url.
+          // When the single page app is loaded further down in this file,
+          // the correct url will be waiting in the browser's history for
+          // the single page app to route accordingly.
+          (function(l) {
+            if (l.search[1] === '/' ) {
+              var decoded = l.search.slice(1).split('&').map(function(s) {
+                return s.replace(/~and~/g, '&')
+              }).join('?');
+              window.history.replaceState(null, null,
+                  l.pathname.slice(0, -1) + decoded + l.hash
+              );
+            }
+          }(window.location))
+        </script>
+        <!-- End Single Page Apps for GitHub Pages -->
     </head>
     <body>
         <div id="root"></div>
diff --git a/webpack.config.ts b/webpack.config.ts
index 3bf3cb5..c2f2f90 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -60,7 +60,8 @@ module.exports = (env: any, argv: any) => {
             }),
             new CopyWebpackPlugin({
                 patterns: [
-                    {from: path.resolve(__dirname, 'assets/'), to: 'assets'}
+                    {from: path.resolve(__dirname, 'assets/'), to: 'assets'},
+                    {from: path.resolve(__dirname, "404.html"), to: ""},
                 ]
             }),
         ],
