diff --git a/uppsrc/CtrlCore/CocoAfter.h b/uppsrc/CtrlCore/CocoAfter.h
index 24dde35fd..5ba63469a 100644
--- a/uppsrc/CtrlCore/CocoAfter.h
+++ b/uppsrc/CtrlCore/CocoAfter.h
@@ -21,6 +21,8 @@ int main(int argc, const char **argv, const char **envptr) { \
 	GuiMainFn_(); \
 	UPP::Ctrl::CloseTopCtrls(); \
 	UPP::CocoExit(); \
+	UPP::Ctrl::ShutdownThreads(); \
+	UPP::AppExit__(); \
 	return UPP::GetExitCode(); \
 } \
  \
diff --git a/uppsrc/CtrlCore/GtkAfter.h b/uppsrc/CtrlCore/GtkAfter.h
index 042d889ab..d15cda88d 100644
--- a/uppsrc/CtrlCore/GtkAfter.h
+++ b/uppsrc/CtrlCore/GtkAfter.h
@@ -22,6 +22,7 @@ int main(int argc, char **argv, const char **envptr) { \
 	UPP::AppExecute__(GuiMainFn_); \
 	UPP::Ctrl::CloseTopCtrls(); \
 	UPP::ExitGtkApp(); \
+	UPP::Ctrl::ShutdownThreads(); \
 	UPP::AppExit__(); \
 	return UPP::GetExitCode(); \
 } \
diff --git a/uppsrc/CtrlCore/Win32GuiA.h b/uppsrc/CtrlCore/Win32GuiA.h
index 2397eca14..75ad7f517 100644
--- a/uppsrc/CtrlCore/Win32GuiA.h
+++ b/uppsrc/CtrlCore/Win32GuiA.h
@@ -25,6 +25,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR lpCmdLine, int nCmdS
 		GuiMainFn_(); \
 	} \
 	UPP::Ctrl::ExitWin32(); \
+	UPP::Ctrl::ShutdownThreads(); \
 	UPP::AppExit__(); \
 	return UPP::GetExitCode(); \
 } \
@@ -44,6 +45,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR lpCmdLine, int nCmdSh
 	UPP::AppExecute__(GuiMainFn_); \
 	UPP::Ctrl::CloseTopCtrls(); \
 	UPP::Ctrl::ExitWin32(); \
+	UPP::Ctrl::ShutdownThreads(); \
 	UPP::AppExit__(); \
 	return UPP::GetExitCode(); \
 } \
diff --git a/uppsrc/CtrlCore/X11GuiA.h b/uppsrc/CtrlCore/X11GuiA.h
index c64c91105..122e27c96 100644
--- a/uppsrc/CtrlCore/X11GuiA.h
+++ b/uppsrc/CtrlCore/X11GuiA.h
@@ -17,6 +17,7 @@ int main(int argc, const char **argv, const char **envptr) { \
 	UPP::Ctrl::InitX11(NULL); \
 	UPP::AppExecute__(GuiMainFn_); \
 	UPP::Ctrl::ExitX11(); \
+	UPP::Ctrl::ShutdownThreads(); \
 	UPP::AppExit__(); \
 	return UPP::GetExitCode(); \
 } \