diff --git a/assets.go b/assets.go
index e6450b04..d0123a73 100644
--- a/assets.go
+++ b/assets.go
@@ -16,7 +16,7 @@ func configureAssets(app *aero.Application) {
 	scriptBundle := js.Bundle()
 
 	// Service worker
-	serviceWorkerBytes, err := ioutil.ReadFile("sw/service-worker.js")
+	serviceWorkerBytes, err := ioutil.ReadFile("scripts/ServiceWorker/ServiceWorker.js")
 	serviceWorker := string(serviceWorkerBytes)
 
 	// CSS bundle
diff --git a/sw/service-worker.ts b/scripts/ServiceWorker/ServiceWorker.ts
similarity index 98%
rename from sw/service-worker.ts
rename to scripts/ServiceWorker/ServiceWorker.ts
index c222b0b2..8fae5af2 100644
--- a/sw/service-worker.ts
+++ b/scripts/ServiceWorker/ServiceWorker.ts
@@ -112,6 +112,12 @@ class MyServiceWorker {
 			return
 		}
 
+		// DevTools opening will trigger these "only-if-cached" requests.
+		// https://bugs.chromium.org/p/chromium/issues/detail?id=823392
+		if((evt.request.cache as string) === "only-if-cached" && evt.request.mode !== "same-origin") {
+			return
+		}
+
 		// Fetch via network
 		return evt.respondWith(fetch(evt.request))
 
diff --git a/sw/index.d.ts b/scripts/ServiceWorker/index.d.ts
similarity index 100%
rename from sw/index.d.ts
rename to scripts/ServiceWorker/index.d.ts