diff --git a/terminatorlib/window.py b/terminatorlib/window.py
index 76219e71..a9f261de 100755
--- a/terminatorlib/window.py
+++ b/terminatorlib/window.py
@@ -215,8 +215,10 @@ class Window(Container, gtk.Window):
         return(not (result == gtk.RESPONSE_ACCEPT))
 
     def on_destroy_event(self, widget, data=None):
-        """Handle window descruction"""
+        """Handle window destruction"""
         dbg('destroying self')
+        for terminal in self.get_visible_terminals():
+            terminal.close()
         self.cnxids.remove_all()
         self.terminator.deregister_window(self)
         self.destroy()