diff --git a/Vector/ViewController/SettingsViewController.m b/Vector/ViewController/SettingsViewController.m
index d16a1e22d..1ebae3d8d 100644
--- a/Vector/ViewController/SettingsViewController.m
+++ b/Vector/ViewController/SettingsViewController.m
@@ -64,9 +64,6 @@
     // picker
     MediaPickerViewController* mediaPicker;
     
-    // the first responder
-    UIView* firstResponder;
-    
     // profile updates
     // avatar
     UIImage* newAvatarImage;
@@ -301,20 +298,6 @@
     // FIXME add night mode
 }
 
-#pragma mark - UIScrollView delegate
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
-{
-    if (scrollView == self.tableView)
-    {
-        if ([firstResponder isFirstResponder])
-        {
-            [firstResponder resignFirstResponder];
-            firstResponder = nil;
-        }
-    }
-}
-
 #pragma mark - UITableView data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -489,9 +472,6 @@
             [displaynameCell.mxkTextField removeTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
             [displaynameCell.mxkTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
             
-            [displaynameCell.mxkTextField removeTarget:self action:@selector(textFieldDidBegin:) forControlEvents:UIControlEventEditingDidBegin];
-            [displaynameCell.mxkTextField addTarget:self action:@selector(textFieldDidBegin:) forControlEvents:UIControlEventEditingDidBegin];
-            
             cell = displaynameCell;
         }
         else if (row == userSettingsFirstNameIndex)
@@ -790,12 +770,6 @@
                 [self displayPasswordAlert];
             }
         }
-
-        if ([firstResponder isFirstResponder])
-        {
-            [firstResponder resignFirstResponder];
-            firstResponder = nil;
-        }
         
         [aTableView deselectRowAtIndexPath:indexPath animated:YES];
     }
@@ -1029,11 +1003,6 @@
     }
 }
 
-- (IBAction)textFieldDidBegin:(id)sender
-{
-    firstResponder = (UIView*)sender;
-}
-
 #pragma password update management
 
 - (IBAction)passwordTextFieldDidChange:(id)sender