diff --git a/package.json b/package.json
index b29facd..82a6b47 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "eject": "react-scripts eject",
     "update-changelog": "./scripts/auto-changelog.sh"
   },
+  "homepage": ".",
   "eslintConfig": {
     "extends": "react-app"
   },
diff --git a/src/App.js b/src/App.js
index 49cd88a..0b4298a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -34,8 +34,11 @@ function App() {
 
   if (isLoading) return null
 
+  const currentPath = window.location.pathname;
+  const basename = currentPath.startsWith('/dapps') ? '/dapps' : undefined;
+
   return (
-      <Router>
+      <Router basename={basename}>
         <ScrollToTop>
           <div className="App">
             <Route exact path="/" component={Home} />