diff --git a/src/Notepad3.c b/src/Notepad3.c
index 43a0c7cf4..7ddf15092 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -5610,6 +5610,8 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
 
 
     case CMD_SHIFTESC:
+      FileSave(false, false, false, false, Flags.bPreserveFileModTime);
+    case IDT_FILE_EXIT:
       CloseApplication();
       break;
 
@@ -6263,11 +6265,6 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
       break;
 
 
-    case IDT_FILE_EXIT:
-      CloseApplication();
-      break;
-
-
     case IDT_FILE_SAVEAS:
       if (IsCmdEnabled(hwnd,IDM_FILE_SAVEAS))
         SendWMCommand(hwnd, IDM_FILE_SAVEAS);