diff --git a/Tusker/Screens/Compose/ComposeAttachmentsViewController.swift b/Tusker/Screens/Compose/ComposeAttachmentsViewController.swift
index 920d2aef..6769c214 100644
--- a/Tusker/Screens/Compose/ComposeAttachmentsViewController.swift
+++ b/Tusker/Screens/Compose/ComposeAttachmentsViewController.swift
@@ -266,6 +266,8 @@ class ComposeAttachmentsViewController: UITableViewController {
     }
     
     override func tableView(_ tableView: UITableView, contextMenuConfigurationForRowAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
+        guard indexPath.section == 0 else { return nil }
+        
         let attachment = attachments[indexPath.row]
         // cast to NSIndexPath because identifier needs to conform to NSCopying
         return UIContextMenuConfiguration(identifier: indexPath as NSIndexPath, previewProvider: { () -> UIViewController? in
@@ -300,12 +302,15 @@ class ComposeAttachmentsViewController: UITableViewController {
         let sheetContainer = AssetPickerSheetContainerViewController()
         sheetContainer.assetPicker.assetPickerDelegate = self
         present(sheetContainer, animated: true)
+        //setOverrideTraitCollection(UITraitCollection(userInterfaceLevel: .elevated), forChild: sheetContainer)
     }
 
 }
 
 extension ComposeAttachmentsViewController: UITableViewDragDelegate {
     func tableView(_ tableView: UITableView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
+        guard indexPath.section == 0 else { return [] }
+        
         let attachment = attachments[indexPath.row]
         let provider = NSItemProvider(object: attachment)
         let dragItem = UIDragItem(itemProvider: provider)
@@ -314,6 +319,8 @@ extension ComposeAttachmentsViewController: UITableViewDragDelegate {
     }
     
     func tableView(_ tableView: UITableView, itemsForAddingTo session: UIDragSession, at indexPath: IndexPath, point: CGPoint) -> [UIDragItem] {
+        guard indexPath.section == 0 else { return [] }
+        
         let attachment = attachments[indexPath.row]
         let provider = NSItemProvider(object: attachment)
         let dragItem = UIDragItem(itemProvider: provider)
@@ -322,6 +329,8 @@ extension ComposeAttachmentsViewController: UITableViewDragDelegate {
     }
     
     func tableView(_ tableView: UITableView, dragPreviewParametersForRowAt indexPath: IndexPath) -> UIDragPreviewParameters? {
+        guard indexPath.section == 0 else { return nil }
+        
         let cell = tableView.cellForRow(at: indexPath) as! ComposeAttachmentTableViewCell
         let rect = cell.convert(cell.assetImageView.bounds, from: cell.assetImageView)
         let path = UIBezierPath(roundedRect: rect, cornerRadius: cell.assetImageView.layer.cornerRadius)