diff --git a/Tests/main.swift b/Tests/main.swift
index da47881..fa5820e 100644
--- a/Tests/main.swift
+++ b/Tests/main.swift
@@ -2,27 +2,28 @@ import Adwaita
 import WebView
 
 @main
-struct Test: App{
+struct Test: App {
     let id = "xyz.zaph.webview"
     var app: AdwaitaApp!
 
     @State private var url: String = "https://github.com/AparokshaUI/adwaita-swift"
 
     var scene: Scene {
-        Window(id: "main"){ window in
+        Window(id: "main") { window in
             WebView(url: $url)
                 .setSize(width: 800, height: 600)
                 .topToolbar {
-                    ToolbarView(app: app)
+                    ToolbarView(app: app, window: window)
                 }
-            
+
         }
     }
 }
 
 struct ToolbarView: View {
     @State private var about = false
-    var app: AdwaitaApp 
+    var app: AdwaitaApp
+    var window: AdwaitaWindow
 
     var view: Body {
         HeaderBar.end {
@@ -32,9 +33,13 @@ struct ToolbarView: View {
                 }
                 .keyboardShortcut("n".ctrl())
                 MenuButton("Close Window") {
-                    app.quit()
+                    window.close()
                 }
                 .keyboardShortcut("w".ctrl())
+                MenuButton("Close App") {
+                    app.quit()
+                }
+                .keyboardShortcut("q".ctrl())
                 MenuSection {
                     MenuButton("About Me", window: false) {
                         about = true
@@ -53,7 +58,7 @@ struct ToolbarView: View {
                 issues: .init(string: "https://github.com/Zaphik/AdwaitaWebViewSwift")!
             )
         }
-    
+
     }
-    
+
 }