diff --git a/data/resources/style.css b/data/resources/style.css
index 46a334cc..3b2e050b 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -257,8 +257,8 @@ sidebar-row > * {
   margin-top: 2px;
 }
 
-sidebar-row > * {
-  padding: 9px 9px;
+sidebar-row > * > * {
+  padding: 9px;
 }
 
 sidebar-row:focus > * {
diff --git a/data/resources/ui/sidebar-room-row.ui b/data/resources/ui/sidebar-room-row.ui
index 9b482855..2e89d137 100644
--- a/data/resources/ui/sidebar-room-row.ui
+++ b/data/resources/ui/sidebar-room-row.ui
@@ -3,6 +3,11 @@
   <template class="SidebarRoomRow" parent="ContextMenuBin">
     <child>
       <object class="GtkBox">
+        <binding name="tooltip-text">
+          <lookup name="display-name">
+            <lookup name="room">SidebarRoomRow</lookup>
+          </lookup>
+        </binding>
         <property name="spacing">12</property>
         <child>
           <object class="ComponentsAvatar" id="avatar">