diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 7609eb9a6a..21a90ad493 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -1008,6 +1008,7 @@ groupCallSettingsToggle: Toggle(defaultToggle) {
 	untoggledFg: groupCallMemberNotJoinedStatus;
 }
 groupCallSettingsButton: SettingsButton(defaultSettingsButton) {
+	padding: margins(24px, 10px, 24px, 8px);
 	textFg: groupCallMembersFg;
 	textFgOver: groupCallMembersFg;
 	textBg: groupCallMembersBg;
@@ -1024,6 +1025,7 @@ groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) {
 	textFgOver: attentionButtonFgOver;
 }
 groupCallBoxLabel: FlatLabel(boxLabel) {
+	minWidth: 200px;
 	textFg: groupCallMembersFg;
 }
 groupCallJoinAsLabel: FlatLabel(defaultFlatLabel) {
diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
index f9c077eeac..b68545617a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
@@ -34,7 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls::Group {
 namespace {
 
-constexpr auto kPasswordCharAmount = 28;
+constexpr auto kPasswordCharAmount = 24;
 
 void StartWithBox(
 		not_null<Ui::GenericBox*> box,
@@ -261,7 +261,7 @@ void StartRtmpProcess::FillRtmpRows(
 			const style::FlatLabel &st) {
 		const auto label = container->add(
 			object_ptr<Ui::FlatLabel>(container, std::move(text), st),
-			st::boxRowPadding);
+			st::boxRowPadding + QMargins(0, 0, showButtonStyle->width, 0));
 		label->setSelectable(true);
 		label->setBreakEverywhere(true);
 		if (disabledMenuForLabels) {
@@ -323,6 +323,8 @@ void StartRtmpProcess::FillRtmpRows(
 			: hidden
 			? QString().fill(passChar, kPasswordCharAmount)
 			: key;
+	}) | rpl::after_next([=] {
+		container->resizeToWidth(container->widthNoMargins());
 	});
 	const auto streamKeyLabel = addLabel(
 		std::move(keyLabelContent),