diff --git a/Nuake/Source/Nuake/Window.cpp b/Nuake/Source/Nuake/Window.cpp
index ff6f5690..05db19c3 100644
--- a/Nuake/Source/Nuake/Window.cpp
+++ b/Nuake/Source/Nuake/Window.cpp
@@ -417,7 +417,7 @@ void Window::SetTitlebarHitTestCallback(std::function<void(Window&, int x, int y
 
 void Window::OnWindowFocused(Window& window, bool focused)
 {
-    if (onWindowFocusedCallback)
+    if (onWindowFocusedCallback && !window.ShouldClose())
     {
         onWindowFocusedCallback(window, focused);
     }