diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 28acafb534..ebf54feccf 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -624,10 +624,8 @@ bool MainWidget::setForwardDraft(PeerId peerId, MessageIdsList &&items) {
 	}
 
 	App::history(peer)->setForwardDraft(std::move(items));
-	if (_history->peer() == peer) {
-		_history->cancelReply();
-	}
 	Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
+	_history->cancelReply();
 	return true;
 }