diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_builder.style b/Telegram/SourceFiles/info/userpic/info_userpic_builder.style
index 6b30d2ef8..e608fc9cf 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_builder.style
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_builder.style
@@ -18,7 +18,7 @@ userpicBuilderEmojiSubtitle: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 }
 userpicBuilderEmojiSubtitlePadding: margins(0px, 9px, 0px, 2px);
-userpicBuilderEmojiBubblePaletteSize: size(356px, 56px);
+userpicBuilderEmojiBubblePaletteWidth: 356px;
 userpicBuilderEmojiBubblePalettePadding: margins(12px, 8px, 12px, 8px);
 
 userpicBuilderEmojiSelectorLeft: 5px;
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
index 166820976..919cc900f 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
@@ -434,8 +434,13 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 
 	const auto paletteBg = Ui::AddBubbleWrap(
 		container,
-		st::userpicBuilderEmojiBubblePaletteSize);
-	const auto palette = Ui::CreateChild<Ui::RpWidget>(paletteBg.get());
+		QSize(
+			st::userpicBuilderEmojiBubblePaletteWidth,
+			std::abs(Ui::BubbleWrapInnerRect(QRect(0, 0, 0, 0)).height())
+				+ st::userpicBuilderEmojiAccentColorSize
+				+ rect::m::sum::v(
+					st::userpicBuilderEmojiBubblePalettePadding)));
+	const auto palette = Ui::CreateChild<Ui::VerticalLayout>(paletteBg.get());
 	{
 		constexpr auto kColorsCount = int(7);
 		const auto checkIsSpecial = [=](int i) {
@@ -522,7 +527,7 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 	const auto selectorBg = Ui::AddBubbleWrap(
 		container,
 		QSize(
-			st::userpicBuilderEmojiBubblePaletteSize.width(),
+			st::userpicBuilderEmojiBubblePaletteWidth,
 			st::userpicBuilderEmojiSelectorMinHeight));
 	const auto selector = Ui::CreateChild<EmojiSelector>(
 		selectorBg.get(),