diff --git a/noolite-cli.go b/noolite-cli.go
index d783e3c..43089a3 100644
--- a/noolite-cli.go
+++ b/noolite-cli.go
@@ -113,6 +113,8 @@ func main() {
 
 		fs := http.FileServer(http.Dir("/var/www/static"))
 
-		panic(http.ListenAndServe(fmt.Sprintf(":%d", *http_port), fs))
+		http.Handle("static", fs)
+
+		panic(http.ListenAndServe(fmt.Sprintf(":%d", *http_port), nil))
 	}
 }