diff --git a/src/gui/Pages/Chat/RoomHeader.qml b/src/gui/Pages/Chat/RoomHeader.qml
index b1c513a7..d41f53d2 100644
--- a/src/gui/Pages/Chat/RoomHeader.qml
+++ b/src/gui/Pages/Chat/RoomHeader.qml
@@ -73,11 +73,12 @@ Rectangle {
             Layout.preferredWidth: Math.min(
                 implicitWidth,
                 row.width -
-                row.spacing +
-                (showLeftButton ? row.spacing : 0) +
-                (showRightButton ? row.spacing : 0) +
+                row.spacing -
+                (showLeftButton ? row.spacing : 0) -
+                (showRightButton ? row.spacing : 0) -
                 goToMainPaneButton.width -
                 avatar.width -
+                encryptionStatusButton.width -
                 goToRoomPaneButton.width
             )
             Layout.fillHeight: true
@@ -99,12 +100,13 @@ Rectangle {
             Layout.preferredWidth: Math.min(
                 implicitWidth,
                 row.width -
-                row.spacing +
-                (showLeftButton ? row.spacing : 0) +
-                (showRightButton ? row.spacing : 0) +
+                row.spacing -
+                (showLeftButton ? row.spacing : 0) -
+                (showRightButton ? row.spacing : 0) -
                 goToMainPaneButton.width -
                 avatar.width -
                 nameLabel.width -
+                encryptionStatusButton.width -
                 goToRoomPaneButton.width
             )
             Layout.fillWidth: ! center
@@ -133,10 +135,6 @@ Rectangle {
             text: name && topic ? (`${name}<br>${topic}`) : (name || topic)
         }
 
-        HSpacer {
-            visible: center
-        }
-
         HButton {
             id: encryptionStatusButton
             padded: false
@@ -167,6 +165,10 @@ Rectangle {
             Behavior on Layout.preferredWidth { HNumberAnimation {} }
         }
 
+        HSpacer {
+            visible: center
+        }
+
         HButton {
             id: goToRoomPaneButton
             padded: false