diff --git a/submodules/TelegramUI/Components/AvatarEditorScreen/Sources/AvatarEditorScreen.swift b/submodules/TelegramUI/Components/AvatarEditorScreen/Sources/AvatarEditorScreen.swift
index 5cc53a7184..fbeb745242 100644
--- a/submodules/TelegramUI/Components/AvatarEditorScreen/Sources/AvatarEditorScreen.swift
+++ b/submodules/TelegramUI/Components/AvatarEditorScreen/Sources/AvatarEditorScreen.swift
@@ -1045,8 +1045,9 @@ final class AvatarEditorScreenComponent: Component {
                             state.updated(transition: .easeInOut(duration: 0.2))
                         }
                     },
-                    openColorPicker: { [weak state] in
-                        if let state {
+                    openColorPicker: { [weak self, weak state] in
+                        if let self, let state {
+                            self.endEditing(true)
                             state.editingColor = true
                             state.previousColor = state.selectedBackground
                             state.previousCustomColor = state.customColor
diff --git a/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift b/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
index fc56f247b9..cc37c3835e 100644
--- a/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
+++ b/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
@@ -1041,13 +1041,11 @@ final class StoryItemSetContainerSendMessage {
                 immediateExternalShare: false,
                 forceTheme: defaultDarkColorPresentationTheme
             )
-            if !component.slice.peer.isService {
-                shareController.shareStory = { [weak view] in
-                    guard let view else {
-                        return
-                    }
-                    view.openStoryEditing(repost: true)
+            shareController.shareStory = { [weak view] in
+                guard let view else {
+                    return
                 }
+                view.openStoryEditing(repost: true)
             }
             shareController.completed = { [weak view] peerIds in
                 guard let view, let component = view.component else {