diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 6c0e38228..6a8af49d0 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3014,6 +3014,7 @@ typedef enum : NSUInteger {
             OWSAssertDebug(pickerModal);
 
             [self dismissKeyBoard];
+            pickerModal.modalPresentationStyle = UIModalPresentationFullScreen;
             [self presentViewController:pickerModal animated:YES completion:nil];
         }];
     }];
@@ -3049,6 +3050,7 @@ typedef enum : NSUInteger {
         pickerModal.sendMediaNavDelegate = self;
 
         [self dismissKeyBoard];
+        pickerModal.modalPresentationStyle = UIModalPresentationFullScreen;
         [self presentViewController:pickerModal animated:YES completion:nil];
     }];
 }
diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift
index 42393dfa6..528426807 100644
--- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift
+++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift
@@ -58,7 +58,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
 
         // ensure images at the end of the list can be scrolled above the bottom buttons
         let bottomButtonInset = -1 * SendMediaNavigationController.bottomButtonsCenterOffset + SendMediaNavigationController.bottomButtonWidth / 2
-        collectionView.contentInset.bottom = bottomButtonInset + 8
+        collectionView.contentInset.bottom = bottomButtonInset + 16
         view.backgroundColor = .white
 
         // The PhotoCaptureVC needs a shadow behind it's cancel button, so we use a custom icon.