diff --git a/app/headless/headless.go b/app/headless/headless.go
index b451cde8..385842e4 100644
--- a/app/headless/headless.go
+++ b/app/headless/headless.go
@@ -96,12 +96,12 @@ func (w *Window) Release() {
 			w.gpu.Release()
 			w.gpu = nil
 		}
-		if w.ctx != nil {
-			w.ctx.Release()
-			w.ctx = nil
-		}
 		return nil
 	})
+	if w.ctx != nil {
+		w.ctx.Release()
+		w.ctx = nil
+	}
 }
 
 // Frame replace the window content and state with the