diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 74d30bf59a..1cbc7cd735 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -251,7 +251,8 @@ $activeBorderColor: $primary-content;
             margin-top: auto;
             margin-bottom: auto;
             display: none;
-            position: relative;
+            position: absolute;
+            right: 4px;
 
             &::before {
                 top: 3px;
@@ -327,6 +328,16 @@ $activeBorderColor: $primary-content;
         }
     }
 
+    .mx_SpaceItem:not(.mx_SpaceItem_new) {
+        .mx_SpaceButton:hover,
+        .mx_SpaceButton:focus-within,
+        .mx_SpaceButton_hasMenuOpen {
+            &:not(.mx_SpaceButton_narrow):not(.mx_SpaceButton_invite) .mx_SpaceButton_name {
+                max-width: calc(100% - 56px);
+            }
+        }
+    }
+
     /* root space buttons are bigger and not indented */
     & > .mx_AutoHideScrollbar {
         flex: 1;