diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp
index 6f8869b06..750933155 100644
--- a/PowerEditor/src/NppBigSwitch.cpp
+++ b/PowerEditor/src/NppBigSwitch.cpp
@@ -2206,6 +2206,9 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
 			if (_isEndingSessionButNotReady) 
 				::DestroyWindow(hwnd);
 
+			if (message == WM_CLOSE)
+				return 0;
+
 			return TRUE;
 		}