diff --git a/src/WallpaperEngine/Render/Drivers/Output/CX11Output.cpp b/src/WallpaperEngine/Render/Drivers/Output/CX11Output.cpp
index 3fb059c..55578aa 100644
--- a/src/WallpaperEngine/Render/Drivers/Output/CX11Output.cpp
+++ b/src/WallpaperEngine/Render/Drivers/Output/CX11Output.cpp
@@ -8,6 +8,8 @@
 
 #define FULLSCREEN_CHECK_WAIT_TIME 250
 
+extern bool g_KeepRunning;
+
 using namespace WallpaperEngine::Render::Drivers::Output;
 
 void CustomXIOErrorExitHandler (Display* dsp, void* userdata)
@@ -228,5 +230,5 @@ void CX11Output::updateRender () const
 		// give the cpu some time to check again later
 		usleep (FULLSCREEN_CHECK_WAIT_TIME);
 	}
-	while (isFullscreen);
+	while (isFullscreen && g_KeepRunning);
 }