diff --git a/server/serve_files.go b/server/serve_files.go
index b44e8bc7..b4eef90a 100644
--- a/server/serve_files.go
+++ b/server/serve_files.go
@@ -23,7 +23,6 @@ const longCacheControl = "public, max-age=31536000, immutable"
 const disabledCacheControl = "no-cache, no-store, must-revalidate"
 
 type File struct {
-	Path         string
 	Asset        string
 	GzipAsset    []byte
 	Hash         string
@@ -45,7 +44,7 @@ func newH2PushAsset(name string) h2PushAsset {
 }
 
 var (
-	files []*File
+	files = map[string]*File{}
 
 	indexStylesheet    string
 	indexScripts       []string
@@ -120,7 +119,6 @@ func (d *Dispatch) initFileServer() {
 			}
 
 			file := &File{
-				Path:         "/" + assetName,
 				Asset:        asset,
 				ContentType:  contentTypes[filepath.Ext(assetName)],
 				CacheControl: longCacheControl,
@@ -136,7 +134,7 @@ func (d *Dispatch) initFileServer() {
 				file.GzipAsset = gzipAsset(data)
 			}
 
-			files = append(files, file)
+			files["/"+assetName] = file
 		}
 
 		serviceWorker = decompressedAsset("sw.js")
@@ -219,6 +217,11 @@ func (d *Dispatch) serveFiles(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if file, ok := files[r.URL.Path]; ok {
+		d.serveFile(w, r, file)
+		return
+	}
+
 	if r.URL.Path == "/sw.js" {
 		w.Header().Set("Cache-Control", disabledCacheControl)
 		w.Header().Set("Content-Type", "text/javascript")
@@ -234,13 +237,6 @@ func (d *Dispatch) serveFiles(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	for _, file := range files {
-		if r.URL.Path == file.Path {
-			d.serveFile(w, r, file)
-			return
-		}
-	}
-
 	d.serveIndex(w, r)
 }
 
diff --git a/server/server.go b/server/server.go
index 779b88bc..620b05ad 100644
--- a/server/server.go
+++ b/server/server.go
@@ -166,7 +166,19 @@ func (d *Dispatch) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if strings.HasPrefix(r.URL.Path, "/ws") {
+	if r.URL.Path == "/init" {
+		referer, err := url.Parse(r.Header.Get("Referer"))
+		if err != nil {
+			fail(w, http.StatusInternalServerError)
+			return
+		}
+
+		state := d.handleAuth(w, r, true, true)
+		data := getIndexData(r, referer.EscapedPath(), state)
+
+		writeJSON(w, r, data)
+
+	} else if strings.HasPrefix(r.URL.Path, "/ws") {
 		if !websocket.IsWebSocketUpgrade(r) {
 			fail(w, http.StatusBadRequest)
 			return
@@ -180,18 +192,6 @@ func (d *Dispatch) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 
 		d.upgradeWS(w, r, state)
-	} else if strings.HasPrefix(r.URL.Path, "/init") {
-		referer, err := url.Parse(r.Header.Get("Referer"))
-		if err != nil {
-			fail(w, http.StatusInternalServerError)
-			return
-		}
-
-		state := d.handleAuth(w, r, true, true)
-		data := getIndexData(r, referer.EscapedPath(), state)
-
-		writeJSON(w, r, data)
-
 	} else {
 		d.serveFiles(w, r)
 	}