diff --git a/src/apprt/glfw.zig b/src/apprt/glfw.zig
index a3e43b153..d8da82640 100644
--- a/src/apprt/glfw.zig
+++ b/src/apprt/glfw.zig
@@ -93,7 +93,13 @@ pub const App = struct {
 
             // Tick the terminal app
             const should_quit = try self.app.tick(self);
-            if (should_quit) return;
+            if (should_quit) {
+                for (self.app.surfaces.items) |surface| {
+                    surface.close(false);
+                }
+
+                return;
+            }
         }
     }