diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 5018b2ff0..ab5dff3ba 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -623,6 +623,15 @@ void PressKey(SDL_Keycode vkey, uint16_t modState)
 
 void HandleMouseButtonDown(Uint8 button, uint16_t modState)
 {
+	if (stextflag != STORE_NONE && (button == SDL_BUTTON_X1
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
+	        || button == 8
+#endif
+	        )) {
+		StoreESC();
+		return;
+	}
+
 	if (sgbMouseDown == CLICK_NONE) {
 		switch (button) {
 		case SDL_BUTTON_LEFT: