diff --git a/src/index.html b/src/index.html
index 6ca6d916..1ed47b12 100755
--- a/src/index.html
+++ b/src/index.html
@@ -116,7 +116,7 @@
 </body>
 <script type="text/javascript">
 	if ('serviceWorker' in navigator){
-		navigator.serviceWorker.register('service-worker.js')
+		navigator.serviceWorker.register('<%= baseHref %>service-worker.js')
 			.then(function(registration){
 				console.log('Service worker registered');
 			}).catch(function(error){
diff --git a/src/manifest.json b/src/manifest.json
index 402037b7..3d0be4dc 100755
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,4 +1,6 @@
 {
+  "start_url": ".",
+  "scope": ".",
   "manifest_version": "3.55",
   "short_name": "Iris",
   "name": "Iris",
@@ -24,7 +26,6 @@
       "sizes": "512x512"
     }
   ],
-  "start_url": "/",
   "background_color": "#08d58f",
   "theme_color": "#181818",
   "display": "standalone",