diff --git a/scripts/wk/ui/tui.py b/scripts/wk/ui/tui.py
index 681f0a62..a6662d14 100644
--- a/scripts/wk/ui/tui.py
+++ b/scripts/wk/ui/tui.py
@@ -1,6 +1,7 @@
 """WizardKit: TUI functions"""
 # vim: sts=2 sw=2 ts=2
 
+import atexit
 import logging
 import time
 
@@ -38,6 +39,9 @@ class TUI():
     self.init_tmux()
     start_thread(self.fix_layout_loop)
 
+    # Close all panes at exit
+    atexit.register(tmux.kill_all_panes)
+
   def add_info_pane(self, height, **tmux_args) -> None:
     """Add info pane."""
     tmux_args.update({