diff --git a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerSearchCell.swift b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerSearchCell.swift
index dc048f67..546db989 100644
--- a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerSearchCell.swift
+++ b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerSearchCell.swift
@@ -52,6 +52,7 @@ class PickServerSearchCell: UITableViewCell {
         textField.clearButtonMode = .whileEditing
         textField.autocapitalizationType = .none
         textField.autocorrectionType = .no
+        textField.returnKeyType = .done
         return textField
     }()
     
@@ -78,6 +79,7 @@ extension PickServerSearchCell {
         backgroundColor = Asset.Colors.Background.systemGroupedBackground.color
         
         searchTextField.addTarget(self, action: #selector(textFieldDidChange(_:)), for: .editingChanged)
+        searchTextField.delegate = self
         
         contentView.addSubview(bgView)
         contentView.addSubview(textFieldBgView)
@@ -107,3 +109,12 @@ extension PickServerSearchCell {
         delegate?.pickServerSearchCell(self, searchTextDidChange: textField.text)
     }
 }
+
+// MARK: - UITextFieldDelegate
+extension PickServerSearchCell: UITextFieldDelegate {
+
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        textField.resignFirstResponder()
+        return false
+    }
+}