diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
index a1bd5d87a..155c670e8 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
@@ -92,7 +92,7 @@ std::unique_ptr<PeerListRow> ListController::createRow(
 }
 
 void ListController::prepare() {
-	setSearchNoResultsText(lang(lng_blocked_list_not_found));
+	setSearchNoResultsText(lang(lng_bot_groups_not_found));
 	delegate()->peerListSetSearchMode(PeerListSearchMode::Enabled);
 	delegate()->peerListSetTitle(langFactory(lng_profile_common_groups_section));
 }
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index e748e0ca0..43353e17c 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -866,10 +866,12 @@ void WrapWidget::resizeEvent(QResizeEvent *e) {
 
 void WrapWidget::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Escape) {
-		showBackFromStack();
-	} else {
-		SectionWidget::keyPressEvent(e);
+		if (hasStackHistory() || wrap() != Wrap::Layer) {
+			showBackFromStack();
+			return;
+		}
 	}
+	SectionWidget::keyPressEvent(e);
 }
 
 void WrapWidget::updateContentGeometry() {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index c1ce488a6..0c962bd4f 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -2007,15 +2007,20 @@ void ListWidget::refreshHeight() {
 }
 
 int ListWidget::recountHeight() {
+	if (_sections.empty()) {
+		if (auto count = _slice.fullCount()) {
+			if (*count == 0) {
+				return 0;
+			}
+		}
+	}
 	auto cachedPadding = padding();
 	auto result = cachedPadding.top();
 	for (auto &section : _sections) {
 		section.setTop(result);
 		result += section.height();
 	}
-	return (result > cachedPadding.top())
-		? (result + cachedPadding.bottom())
-		: 0;
+	return result + cachedPadding.bottom();
 }
 
 void ListWidget::mouseActionUpdate() {