diff --git a/data/resources/ui/sidebar.ui b/data/resources/ui/sidebar.ui
index 2f3eb9b8..69b31d73 100644
--- a/data/resources/ui/sidebar.ui
+++ b/data/resources/ui/sidebar.ui
@@ -148,7 +148,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkScrolledWindow">
+          <object class="GtkScrolledWindow" id="scrolled_window">
             <property name="vexpand">True</property>
             <property name="hscrollbar-policy">never</property>
             <property name="child">
diff --git a/src/session/sidebar/mod.rs b/src/session/sidebar/mod.rs
index 843951fc..a32f4cac 100644
--- a/src/session/sidebar/mod.rs
+++ b/src/session/sidebar/mod.rs
@@ -60,6 +60,8 @@ mod imp {
         #[template_child]
         pub headerbar: TemplateChild<adw::HeaderBar>,
         #[template_child]
+        pub scrolled_window: TemplateChild<gtk::ScrolledWindow>,
+        #[template_child]
         pub listview: TemplateChild<gtk::ListView>,
         #[template_child]
         pub room_search_entry: TemplateChild<gtk::SearchEntry>,
@@ -259,6 +261,13 @@ mod imp {
                     btn.set_popover(Some(account_switcher));
                 }
             }));
+
+            // FIXME: Remove this hack once https://gitlab.gnome.org/GNOME/gtk/-/issues/4938 is resolved
+            self.scrolled_window
+                .vscrollbar()
+                .first_child()
+                .unwrap()
+                .set_overflow(gtk::Overflow::Hidden);
         }
     }