diff --git a/ui/shared/status/StatusInputListPopup.qml b/ui/shared/status/StatusInputListPopup.qml
index 449b4bcf8d..9be03e21f7 100644
--- a/ui/shared/status/StatusInputListPopup.qml
+++ b/ui/shared/status/StatusInputListPopup.qml
@@ -117,6 +117,9 @@ Popup {
             if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
                 return popup.onClicked(listView.currentIndex)
             }
+            if (!listView.currentItem.visible) {
+                goToNextAvailableIndex(false)
+            }
         }
     }