diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
index 1ecd06f426..ac84368a67 100644
--- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -9154,6 +9154,7 @@ Sorry for the inconvenience.";
 "WallpaperPreview.ChatBottomText" = "Enjoy the view.";
 
 "Conversation.Theme.SetPhotoWallpaper" = "Choose Wallpaper from Photos";
+"Conversation.Theme.SetNewPhotoWallpaper" = "Choose a New Wallpaper";
 "Conversation.Theme.SetColorWallpaper" = "Set a Color as Wallpaper";
 
 "Conversation.Theme.ChooseWallpaperTitle" = "Choose Wallpaper";
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift
index 444e2382b1..65455e1c73 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift
@@ -219,6 +219,11 @@ final class WallpaperNavigationButtonNode: HighlightTrackingButtonNode {
         self.animationNode?.setAnimation(name: !isNight ? "anim_sun_reverse" : "anim_sun", colors: [:])
         self.animationNode?.speed = 1.66
         self.animationNode?.playOnce()
+        
+        self.isUserInteractionEnabled = false
+        Queue.mainQueue().after(0.4) {
+            self.isUserInteractionEnabled = true
+        }
     }
     
     var buttonColor: UIColor = UIColor(rgb: 0x000000, alpha: 0.3) {
diff --git a/submodules/TelegramUI/Sources/ChatThemeScreen.swift b/submodules/TelegramUI/Sources/ChatThemeScreen.swift
index 8c8c1ba3bd..93ff7acf41 100644
--- a/submodules/TelegramUI/Sources/ChatThemeScreen.swift
+++ b/submodules/TelegramUI/Sources/ChatThemeScreen.swift
@@ -1015,8 +1015,8 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, UIScrollViewDelega
         var accentButtonTheme = true
         var otherIsEnabled = false
         if self.selectedEmoticon?.strippedEmoji == self.initiallySelectedEmoticon?.strippedEmoji {
-            doneButtonTitle = self.presentationData.strings.Conversation_Theme_SetPhotoWallpaper
             otherIsEnabled = self.controller?.canResetWallpaper == true
+            doneButtonTitle = otherIsEnabled ? self.presentationData.strings.Conversation_Theme_SetNewPhotoWallpaper : self.presentationData.strings.Conversation_Theme_SetPhotoWallpaper
             accentButtonTheme = false
         } else if self.selectedEmoticon == nil && self.initiallySelectedEmoticon != nil {
             doneButtonTitle = self.presentationData.strings.Conversation_Theme_Reset