diff --git a/terminatorlib/newterminator.py b/terminatorlib/newterminator.py
index 6829925d..603a322f 100755
--- a/terminatorlib/newterminator.py
+++ b/terminatorlib/newterminator.py
@@ -66,6 +66,10 @@ class Terminator(Borg):
         dbg('Terminator::deregister_terminal: de-registering %s' % terminal)
         self.terminals.remove(terminal)
 
+        if len(self.terminals) == 0:
+            for window in self.windows:
+                window.destroy()
+
     def reconfigure_terminals(self):
         """Tell all terminals to update their configuration"""