diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/Add/AddFeedViewController.swift
index 13dc65c26..d09dc98d7 100644
--- a/iOS/Add/AddFeedViewController.swift
+++ b/iOS/Add/AddFeedViewController.swift
@@ -34,12 +34,14 @@ class AddFeedViewController: UITableViewController, AddContainerViewControllerCh
 		urlTextField.autocorrectionType = .no
 		urlTextField.autocapitalizationType = .none
 		urlTextField.text = initialFeed
+		urlTextField.delegate = self
 		
 		if initialFeed != nil {
 			delegate?.readyToAdd(state: true)
 		}
 		
 		nameTextField.text = initialFeedName
+		nameTextField.delegate = self
 		
 		pickerData = AddFeedFolderPickerData()
 		folderPickerView.dataSource = self
@@ -200,3 +202,12 @@ private extension AddFeedViewController {
 	}
 	
 }
+
+extension AddFeedViewController: UITextFieldDelegate {
+	
+	func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+		textField.resignFirstResponder()
+		return true
+	}
+	
+}