diff --git a/iOS/UIKit Extensions/PoppableGestureRecognizerDelegate.swift b/iOS/UIKit Extensions/PoppableGestureRecognizerDelegate.swift
index 8df7295bd..2906290bd 100644
--- a/iOS/UIKit Extensions/PoppableGestureRecognizerDelegate.swift	
+++ b/iOS/UIKit Extensions/PoppableGestureRecognizerDelegate.swift	
@@ -18,7 +18,14 @@ final class PoppableGestureRecognizerDelegate: NSObject, UIGestureRecognizerDele
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-		return navigationController?.viewControllers.count ?? 0 > 2
+		return true
     }
 	
+	func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+		if otherGestureRecognizer is UIPanGestureRecognizer {
+			return true
+		}
+		return false
+	}
+	
 }
diff --git a/iOS/UIKit Extensions/UITableView-Extensions.swift b/iOS/UIKit Extensions/UITableView-Extensions.swift
index 368680ee9..fd0c4c0ee 100644
--- a/iOS/UIKit Extensions/UITableView-Extensions.swift	
+++ b/iOS/UIKit Extensions/UITableView-Extensions.swift	
@@ -14,6 +14,13 @@ extension UITableView {
 	Selects a row and scrolls it to the middle if it is not visible
 	*/
 	public func selectRowAndScrollIfNotVisible(at indexPath: IndexPath, animations: Animations) {
+		guard let dataSource = dataSource,
+			let numberOfSections = dataSource.numberOfSections,
+			indexPath.section < numberOfSections(self),
+			indexPath.row < dataSource.tableView(self, numberOfRowsInSection: indexPath.section) else {
+				return
+		}
+		
 		selectRow(at: indexPath, animated: animations.contains(.select), scrollPosition: .none)
 
 		if let visibleIndexPaths = indexPathsForRows(in: safeAreaLayoutGuide.layoutFrame) {