diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/Add/AddFeedViewController.swift
index fe3efe26f..b2b84cee0 100644
--- a/iOS/Add/AddFeedViewController.swift
+++ b/iOS/Add/AddFeedViewController.swift
@@ -126,11 +126,12 @@ class AddFeedViewController: UITableViewController, AddContainerViewControllerCh
 	}
 	
 	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-		if section == 1 {
-			return shouldDisplayPicker ? 2 : 1
+		let defaultNumberOfRows = super.tableView(tableView, numberOfRowsInSection: section)
+		if section == 1 && !shouldDisplayPicker {
+			return defaultNumberOfRows - 1
 		}
 		
-		return super.tableView(tableView, numberOfRowsInSection: section)
+		return defaultNumberOfRows
 	}
 	
 	
diff --git a/iOS/Add/AddFolderViewController.swift b/iOS/Add/AddFolderViewController.swift
index 3f2d9e6f1..3e7849937 100644
--- a/iOS/Add/AddFolderViewController.swift
+++ b/iOS/Add/AddFolderViewController.swift
@@ -64,11 +64,12 @@ class AddFolderViewController: UITableViewController, AddContainerViewController
 	}
 	
 	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+		let defaultNumberOfRows = super.tableView(tableView, numberOfRowsInSection: section)
 		if section == 1 && !shouldDisplayPicker {
-			return 1
+			return defaultNumberOfRows - 1
 		}
 		
-		return super.tableView(tableView, numberOfRowsInSection: section)
+		return defaultNumberOfRows	
 	}
 }