diff --git a/v2/internal/frontend/devserver/devserver.go b/v2/internal/frontend/devserver/devserver.go
index 2f0e5066a..0d1d7cc3e 100644
--- a/v2/internal/frontend/devserver/devserver.go
+++ b/v2/internal/frontend/devserver/devserver.go
@@ -132,22 +132,18 @@ func (d *DevWebServer) Run(ctx context.Context) error {
 		}(d.server, d.logger)
 
 		d.LogDebug("Serving DevServer at http://%s", devServerAddr)
-
-		defer func() {
-			err := d.server.Shutdown(context.Background())
-			if err != nil {
-				d.logger.Error(err.Error())
-			}
-		}()
 	}
 
 	// Launch desktop app
 	err = d.desktopFrontend.Run(ctx)
-	d.LogDebug("Starting shutdown")
 
 	return err
 }
 
+func (d *DevWebServer) RunMainLoop() {
+	d.desktopFrontend.RunMainLoop()
+}
+
 func (d *DevWebServer) Quit() {
 	d.desktopFrontend.Quit()
 }
@@ -186,6 +182,10 @@ func (d *DevWebServer) WindowSetTitle(title string) {
 	d.desktopFrontend.WindowSetTitle(title)
 }
 
+func (d *DevWebServer) WindowClose() {
+	d.desktopFrontend.WindowClose()
+}
+
 func (d *DevWebServer) WindowShow() {
 	d.desktopFrontend.WindowShow()
 }