diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp
index 7704e02386..50fe3002a5 100644
--- a/Userland/Applications/Terminal/main.cpp
+++ b/Userland/Applications/Terminal/main.cpp
@@ -393,6 +393,13 @@ int main(int argc, char** argv)
 
     window->set_menubar(menubar);
 
+    window->on_close = [&]() {
+        if (find_window)
+            find_window->close();
+        if (settings_window)
+            settings_window->close();
+    };
+
     if (unveil("/res", "r") < 0) {
         perror("unveil");
         return 1;