diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index ad42cb8dc6..ee929cfb2c 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -560,6 +560,10 @@ void ChooseThemeController::updateInnerLeft(int now) {
 		? (skip / 2)
 		: std::clamp(now, skip, 0);
 	_inner->move(clamped, 0);
+	const auto visibleTill = -clamped + _content->width();
+	if (_giftsFinishAt - visibleTill < _content->width()) {
+		_peer->owner().cloudThemes().myGiftThemesLoadMore();
+	}
 }
 
 void ChooseThemeController::close() {
@@ -734,6 +738,7 @@ void ChooseThemeController::fill(
 			x += single.width() + skip;
 		};
 
+		_giftsFinishAt = 0;
 		if (const auto now = cloudThemes->themeForToken(initial)) {
 			push(*now, initial);
 		}
@@ -741,6 +746,7 @@ void ChooseThemeController::fill(
 			if (const auto found = cloudThemes->themeForToken(token)) {
 				if (token != initial) {
 					push(*found, token);
+					_giftsFinishAt = x;
 				}
 			}
 		}
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.h b/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
index 603c57839a..3a824ddcdf 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
@@ -73,6 +73,7 @@ private:
 	std::optional<QPoint> _pressPosition;
 	std::optional<QPoint> _dragStartPosition;
 	int _dragStartInnerLeft = 0;
+	int _giftsFinishAt = 0;
 	bool _initialInnerLeftApplied = false;
 
 	rpl::variable<bool> _shouldBeShown = false;