diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index cd739d8ab9..db3b7d40e2 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -3799,7 +3799,7 @@ void ComposeControls::initExpandButton() {
 			}
 			return;
 		}
-		if (_mode != Mode::Normal) {
+		if (_mode != Mode::Normal || !hasRichDraftThreadScope()) {
 			return;
 		}
 		Iv::Editor::ShowComposeBox(
@@ -4181,7 +4181,8 @@ void ComposeControls::updateExpandButtonVisibility() {
 	const auto hidden = !_wrap->isVisible()
 		|| _recording.current()
 		|| !_field->isVisible()
-		|| (_mode != Mode::Normal && !isEditingMessage())
+		|| ((_mode != Mode::Normal || !hasRichDraftThreadScope())
+			&& !isEditingMessage())
 		|| !hasEnoughLinesForExpand()
 		|| textExceedsMaxSize()
 		|| (media && !media->webpage())
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index edbaaa5fd5..77ffa53d06 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -649,6 +649,7 @@ void ShortcutMessages::setupComposeControls() {
 	});
 	_composeControls->setHistory({
 		.history = _history.get(),
+		.sendActionFactory = [=] { return prepareSendAction({}); },
 		.writeRestriction = std::move(writeRestriction),
 	});