diff --git a/ElementX/Sources/Screens/RoomScreen/View/ListTableViewAdapter.swift b/ElementX/Sources/Screens/RoomScreen/View/ListTableViewAdapter.swift
index 87b63f740..8a30a2c04 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/ListTableViewAdapter.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/ListTableViewAdapter.swift
@@ -45,6 +45,7 @@ class ListTableViewAdapter: NSObject, UITableViewDelegate {
         
         super.init()
         
+        tableView.clipsToBounds = true
         tableView.keyboardDismissMode = .onDrag
         
         registerContentOfffsetObserver()
@@ -136,6 +137,7 @@ class ListTableViewAdapter: NSObject, UITableViewDelegate {
     private func registerBoundsObserver() {
         boundsObserverToken = tableView?.observe(\.frame, options: .new, changeHandler: { [weak self] tableView, _ in
             self?.previousFrame = tableView.frame
+            self?.handleScrollViewScroll()
         })
     }