diff --git a/submodules/TelegramUI/Components/LegacyMessageInputPanel/Sources/LegacyMessageInputPanel.swift b/submodules/TelegramUI/Components/LegacyMessageInputPanel/Sources/LegacyMessageInputPanel.swift
index 0b139cf09f..3da6395ee9 100644
--- a/submodules/TelegramUI/Components/LegacyMessageInputPanel/Sources/LegacyMessageInputPanel.swift
+++ b/submodules/TelegramUI/Components/LegacyMessageInputPanel/Sources/LegacyMessageInputPanel.swift
@@ -433,7 +433,7 @@ public class LegacyMessageInputPanelNode: ASDisplayNode, TGCaptionPanelView {
             updateTimeout(nil)
         })))
         
-        let contextController = ContextController(presentationData: presentationData, source: .reference(HeaderContextReferenceContentSource(sourceView: sourceView)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture)
+        let contextController = ContextController(presentationData: presentationData, source: .reference(HeaderContextReferenceContentSource(sourceView: sourceView, position: self.currentIsCaptionAbove ? .bottom : .top)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture)
         self.present(contextController)
     }
         
@@ -551,12 +551,15 @@ private final class HeaderContextReferenceContentSource: ContextReferenceContent
     var keepInPlace: Bool {
         return true
     }
+    
+    let position: ContextControllerReferenceViewInfo.ActionsPosition
 
-    init(sourceView: UIView) {
+    init(sourceView: UIView, position: ContextControllerReferenceViewInfo.ActionsPosition) {
         self.sourceView = sourceView
+        self.position = position
     }
 
     func transitionInfo() -> ContextControllerReferenceViewInfo? {
-        return ContextControllerReferenceViewInfo(referenceView: self.sourceView, contentAreaInScreenSpace: UIScreen.main.bounds, actionsPosition: .top)
+        return ContextControllerReferenceViewInfo(referenceView: self.sourceView, contentAreaInScreenSpace: UIScreen.main.bounds, actionsPosition: self.position)
     }
 }
diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
index 1ea28591f9..a73620df11 100644
--- a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
+++ b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
@@ -1732,11 +1732,11 @@ public final class MediaEditor {
         }
         
         self.updateValues(mode: .skipRendering) { values in
-            var values = values.withUpdatedCollage(collage)
-            if mainVideoIsMuted {
-                values = values.withUpdatedVideoVolume(0.0)
-            }
-            return values
+            return values.withUpdatedCollage(collage)
+        }
+        
+        if mainVideoIsMuted {
+            self.setVideoVolume(0.0)
         }
                 
         self.setupAdditionalVideoPlayback()