diff --git a/app/internal/window/os_wayland.go b/app/internal/window/os_wayland.go
index 34b6236a..1e2cef28 100644
--- a/app/internal/window/os_wayland.go
+++ b/app/internal/window/os_wayland.go
@@ -193,12 +193,12 @@ func newWLWindow(window Callbacks, opts *Options) error {
 			// Decrement window counter.
 			windowCounter <- -1
 		}()
+		defer d.destroy()
+		defer w.destroy()
 		w.w.SetDriver(w)
 		if err := w.loop(); err != nil {
 			panic(err)
 		}
-		w.destroy()
-		d.destroy()
 	}()
 	return nil
 }