diff --git a/uppsrc/Core/Util.cpp b/uppsrc/Core/Util.cpp
index a5fef0477..24f886a45 100644
--- a/uppsrc/Core/Util.cpp
+++ b/uppsrc/Core/Util.cpp
@@ -135,7 +135,7 @@ void    AssertFailed(const char *file, int line, const char *cond)
 	PanicMode = true;
 	char s[2048];
 	sprintf(s, "Assertion failed in %s, line %d\n%s\n", file, line, cond);
-#if defined(PLATFORM_POSIX) && defined(COMPILER_GCC)
+#if defined(PLATFORM_POSIX) && defined(COMPILER_GCC) && defined(flagSTACKTRACE)
 	AddStackTrace(s, sizeof(s));
 #endif
 
diff --git a/uppsrc/CtrlCore/X11App.cpp b/uppsrc/CtrlCore/X11App.cpp
index 799ad00fe..2e67adfa1 100644
--- a/uppsrc/CtrlCore/X11App.cpp
+++ b/uppsrc/CtrlCore/X11App.cpp
@@ -206,6 +206,7 @@ void sPanicMessageBox(const char *title, const char *text)
 		XEvent e;
 		XNextEvent(display, &e);
 		switch(e.type) {
+		case KeyPress:
 		case ButtonPress:
 			XFreeFont(display, font_info);
 			XFreeGC(display, gc);