diff --git a/scripts/loader.py b/scripts/loader.py
index 590388580aef855544d8acbcf228d042e6211040..44559f701ff096d374ca708539376842f827d102 100644
--- a/scripts/loader.py
+++ b/scripts/loader.py
@@ -273,6 +273,11 @@ class osv_thread_apply_all(gdb.Command):
                 gdb.execute(arg, from_tty)
             gdb.write('\n')
 
+def continue_handler(event):
+    exit_thread_context()
+
+gdb.events.cont.connect(continue_handler)
+
 
 osv()
 osv_heap()