diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 0741eb3b1..441ad03d6 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3784,7 +3784,8 @@ void HistoryWidget::pushInfoToThirdSection() {
 
 void HistoryWidget::toggleTabbedSelectorMode() {
 	if (_tabbedPanel) {
-		if (controller()->canShowThirdSection()) {
+		if (controller()->canShowThirdSection()
+			&& !Adaptive::OneColumn()) {
 			Auth().data().setTabbedSelectorSectionEnabled(true);
 			Auth().saveDataDelayed(kSaveTabbedSelectorSectionTimeoutMs);
 			pushTabbedSelectorToThirdSection();
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index 9d89dd328..10681c52d 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -162,7 +162,9 @@ void Controller::resizeForThirdSection() {
 	Auth().data().setTabbedSelectorSectionEnabled(false);
 	Auth().data().setThirdSectionInfoEnabled(false);
 
-	auto extendBy = st::columnMinimalWidthThird;
+	auto extendBy = qMax(
+		minimalThreeColumnWidth() - layout.bodyWidth,
+		st::columnMinimalWidthThird);
 	auto newBodyWidth = layout.bodyWidth + extendBy;
 	dialogsWidthRatio().set(
 		(dialogsWidthRatio().value() * layout.bodyWidth) / newBodyWidth,