diff --git a/TODO.md b/TODO.md
index b7aea28c..26415240 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,6 @@
 
 - server list sorting method / explain what the % number is (stability)
 - server list: make it more obvious that it can be scrolled
-- support (shift+)tab in filter fields
 - clicking cancel on SSO "waiting" box doesn't do anything the first time
 - spam alt+shift+a when starting app on server browser → segfault
 - remove items.Device
diff --git a/src/gui/MainPane/BottomBar.qml b/src/gui/MainPane/BottomBar.qml
index af5cdc97..d14f7ab7 100644
--- a/src/gui/MainPane/BottomBar.qml
+++ b/src/gui/MainPane/BottomBar.qml
@@ -51,6 +51,8 @@ Rectangle {
             Keys.forwardTo: [roomList]
             Keys.priority: Keys.AfterItem
 
+            Keys.onTabPressed: roomList.incrementCurrentIndex()
+            Keys.onBacktabPressed: roomList.decrementCurrentIndex()
             Keys.onEnterPressed: Keys.onReturnPressed(event)
             Keys.onReturnPressed: {
                 roomList.showItemAtIndex()
diff --git a/src/gui/Pages/Chat/RoomPane/MemberView/MemberView.qml b/src/gui/Pages/Chat/RoomPane/MemberView/MemberView.qml
index f4aaa1c3..d5db6b1f 100644
--- a/src/gui/Pages/Chat/RoomPane/MemberView/MemberView.qml
+++ b/src/gui/Pages/Chat/RoomPane/MemberView/MemberView.qml
@@ -48,6 +48,9 @@ HColumnLayout {
                 )
             }
 
+            Keys.onTabPressed: memberList.incrementCurrentIndex()
+            Keys.onBacktabPressed: memberList.decrementCurrentIndex()
+
             Keys.onEnterPressed: Keys.onReturnPressed(event)
             Keys.onReturnPressed: {
                 currentItem.leftClicked()