diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp b/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp
index 32a2eff1f8..872f4ef7af 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp
@@ -37,6 +37,8 @@ ResolveWindow ResolveWindowDefault() {
 			return b;
 		} else if (const auto c = check(app.windowFor(account))) {
 			return c;
+		} else if (Core::Quitting()) {
+			return nullptr;
 		} else if (const auto d = check(app.ensureSeparateWindowFor(
 				account))) {
 			return d;