diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go
index a3a47b3ac..a6a41ea93 100644
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -140,7 +140,12 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 		handler = redirectToHTTPSMiddleware(handler)
 	}
 
-	go http.Serve(listener, handler)
+	go func() {
+		err := http.Serve(listener, handler)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	return nil
 }