diff --git a/TODO.md b/TODO.md
index 078c4e79..1d488e19 100644
--- a/TODO.md
+++ b/TODO.md
@@ -12,7 +12,6 @@
 
 - Fixes
   - Collapsing last account with shortcut when focused on room
-  - Using up/down when sidepane focused
   - Missing hourglass when changing avatar and applying
   - Icons on KDE
   - Greentext for local echo
diff --git a/src/qml/SidePane/DelegateAccount.qml b/src/qml/SidePane/DelegateAccount.qml
index bac9f228..9877bb41 100644
--- a/src/qml/SidePane/DelegateAccount.qml
+++ b/src/qml/SidePane/DelegateAccount.qml
@@ -15,7 +15,8 @@ HTileDelegate {
         window.uiState.page == "Pages/EditAccount/EditAccount.qml" &&
         window.uiState.pageProperties.userId == model.data.user_id
 
-    setCurrentTimer.running: ! accountRoomList.activateLimiter.running
+    setCurrentTimer.running:
+        ! accountRoomList.activateLimiter.running && ! sidePane.hasFocus
 
 
     Behavior on opacity { HNumberAnimation {} }
diff --git a/src/qml/SidePane/DelegateRoom.qml b/src/qml/SidePane/DelegateRoom.qml
index 824fddbf..e66f4bb4 100644
--- a/src/qml/SidePane/DelegateRoom.qml
+++ b/src/qml/SidePane/DelegateRoom.qml
@@ -14,7 +14,8 @@ HTileDelegate {
         window.uiState.pageProperties.userId == model.user_id &&
         window.uiState.pageProperties.roomId == model.data.room_id
 
-    setCurrentTimer.running: ! accountRoomList.activateLimiter.running
+    setCurrentTimer.running:
+        ! accountRoomList.activateLimiter.running && ! sidePane.hasFocus
 
 
     Behavior on opacity { HNumberAnimation {} }