diff --git a/Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.xib b/Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.xib
index cd6361ae3..ce0471da3 100644
--- a/Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.xib
+++ b/Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,20 +11,20 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="IKv-Eo-Uhr" customClass="DirectoryNetworkTableHeaderFooterView" customModule="Riot" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="399" height="40"/>
+            <rect key="frame" x="0.0" y="0.0" width="399" height="103"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DFi-MN-E9H">
-                    <rect key="frame" x="0.0" y="9" width="399" height="30"/>
+                    <rect key="frame" x="0.0" y="44" width="399" height="58"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w20-KY-Toq">
-                            <rect key="frame" x="16" y="5" width="42" height="20.5"/>
+                            <rect key="frame" x="16" y="5" width="42" height="43"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZMw-in-qvp">
-                            <rect key="frame" x="334" y="0.0" width="49" height="30"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZMw-in-qvp">
+                            <rect key="frame" x="334" y="11.5" width="49" height="30"/>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
                             <state key="normal" title="Switch"/>
                             <connections>
@@ -34,25 +34,27 @@
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="30" id="CBk-T8-H3L"/>
                         <constraint firstItem="w20-KY-Toq" firstAttribute="leading" secondItem="DFi-MN-E9H" secondAttribute="leading" constant="16" id="D88-nj-LLg"/>
                         <constraint firstAttribute="trailing" secondItem="ZMw-in-qvp" secondAttribute="trailing" constant="16" id="DfS-xd-Rtc"/>
-                        <constraint firstItem="ZMw-in-qvp" firstAttribute="centerY" secondItem="DFi-MN-E9H" secondAttribute="centerY" id="euM-Vt-Qp0"/>
-                        <constraint firstItem="w20-KY-Toq" firstAttribute="centerY" secondItem="DFi-MN-E9H" secondAttribute="centerY" id="n2J-hq-wkG"/>
+                        <constraint firstAttribute="bottom" secondItem="w20-KY-Toq" secondAttribute="bottom" constant="10" id="LX0-J0-Anb"/>
+                        <constraint firstItem="ZMw-in-qvp" firstAttribute="centerY" secondItem="w20-KY-Toq" secondAttribute="centerY" id="PRm-ML-xYf"/>
+                        <constraint firstItem="w20-KY-Toq" firstAttribute="top" secondItem="DFi-MN-E9H" secondAttribute="top" constant="5" id="mm1-B3-1nV"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eQG-M1-gau">
-                    <rect key="frame" x="16" y="39" width="383" height="1"/>
+                    <rect key="frame" x="16" y="102" width="383" height="1"/>
                     <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="eV0-cd-aDv"/>
                     </constraints>
                 </view>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="Tnw-0a-us5"/>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="DFi-MN-E9H" secondAttribute="bottom" constant="1" id="Bbk-Uz-sn1"/>
                 <constraint firstItem="Tnw-0a-us5" firstAttribute="trailing" secondItem="DFi-MN-E9H" secondAttribute="trailing" id="g30-VP-4hM"/>
+                <constraint firstItem="DFi-MN-E9H" firstAttribute="top" secondItem="IKv-Eo-Uhr" secondAttribute="topMargin" id="iKz-PN-nPf"/>
                 <constraint firstAttribute="trailing" secondItem="eQG-M1-gau" secondAttribute="trailing" id="jiW-vO-gZ0"/>
                 <constraint firstAttribute="bottom" secondItem="eQG-M1-gau" secondAttribute="bottom" id="s0Q-A7-LJG"/>
                 <constraint firstItem="DFi-MN-E9H" firstAttribute="leading" secondItem="Tnw-0a-us5" secondAttribute="leading" id="swz-j4-zcd"/>
@@ -61,13 +63,12 @@
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="Tnw-0a-us5"/>
             <connections>
                 <outlet property="separatorView" destination="eQG-M1-gau" id="hLt-rM-Lsc"/>
                 <outlet property="switchButton" destination="ZMw-in-qvp" id="Tdr-44-Akl"/>
                 <outlet property="titleLabel" destination="w20-KY-Toq" id="AgV-tj-DYl"/>
             </connections>
-            <point key="canvasLocation" x="-676.08695652173924" y="-641.85267857142856"/>
+            <point key="canvasLocation" x="-676.08695652173924" y="-607.03125"/>
         </view>
     </objects>
 </document>
diff --git a/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift b/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
index a9c9362e7..1e2cf5daf 100644
--- a/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
+++ b/Riot/Modules/Rooms/ShowDirectory/ShowDirectoryViewController.swift
@@ -22,6 +22,10 @@ final class ShowDirectoryViewController: UIViewController {
     
     // MARK: - Constants
     
+    private enum Constants {
+        static let networkHeaderViewEstimatedHeight: CGFloat = 40.0
+    }
+    
     // MARK: - Properties
     
     // MARK: Outlets
@@ -312,9 +316,24 @@ extension ShowDirectoryViewController: UITableViewDelegate {
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 40
+        return UITableView.automaticDimension
     }
     
+    func tableView(_ tableView: UITableView,
+                   estimatedHeightForHeaderInSection section: Int) -> CGFloat {
+        let directorySection = self.sections[section]
+        
+        let estimatedHeight: CGFloat
+        
+        switch directorySection {
+        case .searchInput:
+            estimatedHeight = 0.0
+        case .publicRoomsDirectory:
+            estimatedHeight = Constants.networkHeaderViewEstimatedHeight
+        }
+        
+        return estimatedHeight
+    }
 }
 
 // MARK: - UISearchBarDelegate