diff --git a/main/Data Source/GroupedDomainDataSource.swift b/main/Data Source/GroupedDomainDataSource.swift
index 6f49a20..d292d5e 100644
--- a/main/Data Source/GroupedDomainDataSource.swift	
+++ b/main/Data Source/GroupedDomainDataSource.swift	
@@ -288,7 +288,7 @@ extension GroupedDomainEditRow  {
 // MARK: Extensions
 extension TVCDomains : GroupedDomainEditRow {
 	override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
-		getRowActionsIOS9(indexPath)
+		getRowActionsIOS9(indexPath, tableView)
 	}
 	@available(iOS 11.0, *)
 	override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
@@ -298,7 +298,7 @@ extension TVCDomains : GroupedDomainEditRow {
 
 extension TVCHosts : GroupedDomainEditRow {
 	override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
-		getRowActionsIOS9(indexPath)
+		getRowActionsIOS9(indexPath, tableView)
 	}
 	@available(iOS 11.0, *)
 	override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
diff --git a/main/Extensions/TableView.swift b/main/Extensions/TableView.swift
index b3268dc..710c873 100644
--- a/main/Extensions/TableView.swift
+++ b/main/Extensions/TableView.swift
@@ -43,19 +43,6 @@ extension UITableView {
 	func safeMoveRow(_ from: Int, to: Int) {
 		isFrontmost ? moveRow(at: IndexPath(row: from), to: IndexPath(row: to)) : reloadData()
 	}
-	
-	/// Scroll table to top (while respecting `contentInset`)
-	func scrollToTop(animated: Bool) {
-		let top: CGFloat
-		if #available(iOS 11.0, *) {
-			top = adjustedContentInset.top
-		} else {
-			top = contentInset.top
-		}
-		if contentOffset.y != -top {
-			setContentOffset(.init(x: 0, y: -top), animated: animated)
-		}
-	}
 }
 
 
@@ -73,10 +60,13 @@ protocol EditableRows {
 }
 
 extension EditableRows where Self: UITableViewDelegate {
-	func getRowActionsIOS9(_ index: IndexPath) -> [UITableViewRowAction]? {
+	func getRowActionsIOS9(_ index: IndexPath, _ table: UITableView) -> [UITableViewRowAction]? {
 		let userInfo = editableRowUserInfo(index)
 		return editableRowActions(index).compactMap { a,t in
-			let x = UITableViewRowAction(style: a == .delete ? .destructive : .normal, title: t) { self.editableRowCallback($1, a, userInfo) }
+			let x = UITableViewRowAction(style: a == .delete ? .destructive : .normal, title: t) {
+				self.editableRowCallback($1, a, userInfo)
+				table.isEditing = false
+			}
 			if let color = editableRowActionColor(index, a) {
 				x.backgroundColor = color
 			}
diff --git a/main/Recordings/TVCPreviousRecords.swift b/main/Recordings/TVCPreviousRecords.swift
index dc43a69..5d9dd70 100644
--- a/main/Recordings/TVCPreviousRecords.swift
+++ b/main/Recordings/TVCPreviousRecords.swift
@@ -77,7 +77,7 @@ class TVCPreviousRecords: UITableViewController, EditActionsRemove {
 	// MARK: - Editing
 	
 	override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
-		getRowActionsIOS9(indexPath)
+		getRowActionsIOS9(indexPath, tableView)
 	}
 	@available(iOS 11.0, *)
 	override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
diff --git a/main/Recordings/TVCRecordingDetails.swift b/main/Recordings/TVCRecordingDetails.swift
index 9ee61b6..efd2e6c 100644
--- a/main/Recordings/TVCRecordingDetails.swift
+++ b/main/Recordings/TVCRecordingDetails.swift
@@ -26,7 +26,7 @@ class TVCRecordingDetails: UITableViewController, EditActionsRemove {
 	// MARK: - Editing
 	
 	override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
-		getRowActionsIOS9(indexPath)
+		getRowActionsIOS9(indexPath, tableView)
 	}
 	@available(iOS 11.0, *)
 	override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
diff --git a/main/Settings/TVCFilter.swift b/main/Settings/TVCFilter.swift
index cf7a1de..2078da1 100644
--- a/main/Settings/TVCFilter.swift
+++ b/main/Settings/TVCFilter.swift
@@ -64,7 +64,7 @@ class TVCFilter: UITableViewController, EditActionsRemove {
 	// MARK: - Editing
 	
 	override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
-		getRowActionsIOS9(indexPath)
+		getRowActionsIOS9(indexPath, tableView)
 	}
 	@available(iOS 11.0, *)
 	override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {