diff --git a/src/QuickSwitcher.cc b/src/QuickSwitcher.cc
index 3596a8c4..2aa05f3c 100644
--- a/src/QuickSwitcher.cc
+++ b/src/QuickSwitcher.cc
@@ -31,17 +31,22 @@ RoomSearchInput::RoomSearchInput(QWidget *parent)
 void
 RoomSearchInput::keyPressEvent(QKeyEvent *event)
 {
-        if (event->key() == Qt::Key_Tab || event->key() == Qt::Key_Down) {
+        switch (event->key()) {
+        case Qt::Key_Tab:
+        case Qt::Key_Down: {
                 emit selectNextCompletion();
                 event->accept();
-                return;
-        } else if (event->key() == Qt::Key_Up) {
+                break;
+        }
+        case Qt::Key_Backtab:
+        case Qt::Key_Up: {
                 emit selectPreviousCompletion();
                 event->accept();
-                return;
+                break;
+        }
+        default:
+                TextField::keyPressEvent(event);
         }
-
-        TextField::keyPressEvent(event);
 }
 
 void
diff --git a/src/SuggestionsPopup.cpp b/src/SuggestionsPopup.cpp
index 86586c92..9ac2ef23 100644
--- a/src/SuggestionsPopup.cpp
+++ b/src/SuggestionsPopup.cpp
@@ -136,6 +136,8 @@ SuggestionsPopup::addRooms(const std::vector<RoomSearchResult> &rooms)
         adjustSize();
 
         resize(geometry().width(), 40 * rooms.size());
+
+        selectNextSuggestion();
 }
 
 void
@@ -158,6 +160,8 @@ SuggestionsPopup::addUsers(const QVector<SearchResult> &users)
         adjustSize();
 
         resize(geometry().width(), 40 * users.size());
+
+        selectNextSuggestion();
 }
 
 void