From 8a2053fcaf62bfa4cf293df1d728beb92ad38b41 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Fri, 30 Aug 2019 11:24:47 -0400
Subject: [PATCH] Fix collapsing account with keyboard

When collapsing the account and the current page/focus is a room of this
account, switch focus to the account.
---
 TODO.md                           | 1 -
 src/qml/SidePane/SidePaneList.qml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/TODO.md b/TODO.md
index 1d488e19..56bcb266 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,7 +11,6 @@
   - When qml syntax highlighting supports ES6 string interpolation, use them
 
 - Fixes
-  - Collapsing last account with shortcut when focused on room
   - Missing hourglass when changing avatar and applying
   - Icons on KDE
   - Greentext for local echo
diff --git a/src/qml/SidePane/SidePaneList.qml b/src/qml/SidePane/SidePaneList.qml
index 93daf3de..00e92107 100644
--- a/src/qml/SidePane/SidePaneList.qml
+++ b/src/qml/SidePane/SidePaneList.qml
@@ -88,6 +88,7 @@ HListView {
             {
                 currentIndex = i
                 currentItem.item.toggleCollapse()
+                activate()
             }
         }
     }