diff --git a/CHANGES.rst b/CHANGES.rst
index 4f9ab91a1..3bb978f30 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -17,7 +17,8 @@ Changes to be released in next version
  * Use different title for scan button for self verification (#4525).
  * it's easy for the back button to trigger a leftpanel reveal (#4438).
  * Show / hide reset button in secrets recovery screen (#4546).
- * Timeline: Fix incorrect crop of media thumbnails.
+ * Share Extension: Fix layout when searching (#4258).
+ * Timeline: Fix incorrect crop of media thumbnails (#4552).
 
 ⚠️ API Changes
  * 
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];
+            }
         }
     }
 }
diff --git a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.xib b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.xib
index 630d940a3..bc77d3275 100644
--- a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.xib
+++ b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.xib
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -39,7 +37,6 @@
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </tableView>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="orV-HH-88x" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="NaR-eJ-WMj"/>
                 <constraint firstItem="Zbr-9e-VZh" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="aRg-Nz-enq"/>
@@ -49,6 +46,7 @@
                 <constraint firstAttribute="trailing" secondItem="Zbr-9e-VZh" secondAttribute="trailing" id="rKb-TZ-sap"/>
                 <constraint firstAttribute="trailing" secondItem="orV-HH-88x" secondAttribute="trailing" id="yBp-63-kZi"/>
             </constraints>
+            <point key="canvasLocation" x="130" y="89"/>
         </view>
     </objects>
 </document>