diff --git a/submodules/LegacyComponents/Sources/TGMediaPickerGalleryModel.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryModel.m
index 1f41d51c92..f4c3addf66 100644
--- a/submodules/LegacyComponents/Sources/TGMediaPickerGalleryModel.m
+++ b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryModel.m
@@ -403,6 +403,7 @@
     
     TGPhotoEditorControllerIntent intent = isVideo ? TGPhotoEditorControllerVideoIntent : TGPhotoEditorControllerGenericIntent;
     TGPhotoEditorController *controller = [[TGPhotoEditorController alloc] initWithContext:_context item:editableMediaItem intent:intent adjustments:adjustments caption:caption screenImage:screenImage availableTabs:_interfaceView.currentTabs selectedTab:tab];
+    controller.modalPresentationStyle = UIModalPresentationFullScreen;
     controller.entitiesView = entitiesView;
     controller.editingContext = _editingContext;
     controller.stickersContext = _stickersContext;
diff --git a/submodules/LegacyComponents/Sources/TGViewController.mm b/submodules/LegacyComponents/Sources/TGViewController.mm
index db80d043bc..565c3585a9 100644
--- a/submodules/LegacyComponents/Sources/TGViewController.mm
+++ b/submodules/LegacyComponents/Sources/TGViewController.mm
@@ -521,12 +521,10 @@ static id<LegacyComponentsContext> _defaultContext = nil;
 
 - (bool)inFormSheet
 {
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone)
+    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
         return false;
-    else
-    {
-        if ([self.navigationController isKindOfClass:[TGNavigationController class]])
-        {
+    } else {
+        if ([self.navigationController isKindOfClass:[TGNavigationController class]]) {
             switch (((TGNavigationController *)self.navigationController).presentationStyle)
             {
                 case TGNavigationControllerPresentationStyleInFormSheet: