diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index cf852496a..ea53f2fea 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -168,7 +168,7 @@ void ScheduledWidget::setupComposeControls() {
 
 	_composeControls->cancelRequests(
 	) | rpl::start_with_next([=] {
-		controller()->showBackFromStack();
+		listCancelRequest();
 	}, lifetime());
 
 	_composeControls->sendRequests(
@@ -1037,6 +1037,10 @@ void ScheduledWidget::listCancelRequest() {
 		clearSelected();
 		return;
 	}
+	if (_composeControls->isEditingMessage()) {
+		_composeControls->cancelEditMessage();
+		return;
+	}
 	controller()->showBackFromStack();
 }