diff --git a/v2/go.mod b/v2/go.mod
index eb538b381..b5533fcb9 100644
--- a/v2/go.mod
+++ b/v2/go.mod
@@ -1,6 +1,6 @@
 module github.com/wailsapp/wails/v2
 
-go 1.19
+go 1.18
 
 require (
 	github.com/Masterminds/semver v1.5.0
diff --git a/v2/internal/app/app_default_unix.go b/v2/internal/app/app_default_unix.go
index 01a3225c7..10d801285 100644
--- a/v2/internal/app/app_default_unix.go
+++ b/v2/internal/app/app_default_unix.go
@@ -1,4 +1,4 @@
-//go:build !dev && !production && !bindings && darwin
+//go:build !dev && !production && !bindings && (linux || darwin)
 
 package app
 
diff --git a/v2/internal/app/app_preflight_unix.go b/v2/internal/app/app_preflight_unix.go
index a135d7234..f554df740 100644
--- a/v2/internal/app/app_preflight_unix.go
+++ b/v2/internal/app/app_preflight_unix.go
@@ -1,4 +1,4 @@
-//go:build unix && !bindings
+//go:build (linux || darwin) && !bindings
 
 package app
 
diff --git a/v2/internal/frontend/desktop/linux/frontend.go b/v2/internal/frontend/desktop/linux/frontend.go
index 64065a270..dce5b2531 100644
--- a/v2/internal/frontend/desktop/linux/frontend.go
+++ b/v2/internal/frontend/desktop/linux/frontend.go
@@ -52,6 +52,14 @@ type Frontend struct {
 	dispatcher frontend.Dispatcher
 }
 
+func (f *Frontend) RunMainLoop() {
+	C.gtk_main()
+}
+
+func (f *Frontend) WindowClose() {
+	f.mainWindow.Destroy()
+}
+
 func init() {
 	runtime.LockOSThread()
 }
@@ -85,7 +93,7 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
 		} else {
 			appBindings.DB().UpdateObfuscatedCallMap()
 		}
-		assets, err := assetserver.NewAssetServer(ctx, appoptions, bindings)
+		assets, err := assetserver.NewAssetServer(ctx, appoptions.Assets, appoptions.AssetsHandler, bindings)
 		if err != nil {
 			log.Fatal(err)
 		}
diff --git a/v2/internal/frontend/desktop/linux/window.go b/v2/internal/frontend/desktop/linux/window.go
index a3ab6f85d..ef6ecafb6 100644
--- a/v2/internal/frontend/desktop/linux/window.go
+++ b/v2/internal/frontend/desktop/linux/window.go
@@ -861,8 +861,6 @@ func (w *Window) Run(url string) {
 		w.Maximise()
 	}
 
-	C.gtk_main()
-	w.Destroy()
 }
 
 func (w *Window) SetKeepAbove(top bool) {