diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css b/src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css
index f3f92cb748..cea38b836b 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css
@@ -21,12 +21,13 @@ limitations under the License.
 }
 
 .mx_DirectorySearchBox_container {
-    display: table;
+    display: flex;
     padding-left: 9px;
+    padding-right: 9px;
 }
 
 .mx_DirectorySearchBox_input {
-    display: table-cell;
+    flex-grow: 1;
     border: 0;
     padding: 0;
     font-weight: 300;
@@ -49,6 +50,8 @@ input[type=text].mx_DirectorySearchBox_input:focus {
     text-indent: 18px;
     font-weight: 600;
     font-size: 12px;
+    user-select: none;
+    cursor: pointer;
 }
 
 .mx_DirectorySearchBox_clear_wrapper {
diff --git a/src/skins/vector/css/vector-web/structures/RoomDirectory.css b/src/skins/vector/css/vector-web/structures/RoomDirectory.css
index 1417c385d0..fdf88e346d 100644
--- a/src/skins/vector/css/vector-web/structures/RoomDirectory.css
+++ b/src/skins/vector/css/vector-web/structures/RoomDirectory.css
@@ -53,6 +53,7 @@ limitations under the License.
 
 .mx_RoomDirectory_listheader {
     display: table;
+    table-layout: fixed;
     width: 100%;
     margin-top: 12px;
     margin-bottom: 12px;
@@ -65,7 +66,7 @@ limitations under the License.
 
 .mx_RoomDirectory_listheader .mx_NetworkDropdown {
     display: table-cell;
-    width: 100%;
+    width: 200px;
 }
 
 .mx_RoomDirectory_tableWrapper {