diff --git a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
index 777249a6e..94acaa453 100644
--- a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
+++ b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
@@ -129,6 +129,13 @@
     }
 }
 
+- (void)setKeyboardHeight:(CGFloat)keyboardHeight
+{
+    // Bypass inherited keyboard handling to fix layout when searching.
+    // There are no sticky headers to worry about updating.
+    return;
+}
+
 #pragma mark - Private
 
 - (void)showShareAlertForRoomPath:(NSIndexPath *)indexPath
@@ -289,6 +296,12 @@
                 // Refresh display
                 [self refreshRecentsTable];
             }
+            
+            // Dismiss the keyboard when scrolling to match the behaviour of the main app.
+            if (self.recentsSearchBar.isFirstResponder)
+            {
+                [self.recentsSearchBar resignFirstResponder];
+            }
         }
     }
 }