diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdentityKeyPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdentityKeyPresenter.java
index 19ab30368..ccf865fb2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdentityKeyPresenter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdentityKeyPresenter.java
@@ -112,8 +112,7 @@ class RemoteSelectIdentityKeyPresenter {
     }
 
     private void goToSelectLayout() {
-        List<UnifiedKeyInfo> filteredKeyInfoData = viewModel.isListAllKeys() || TextUtils.isEmpty(userId.email) ?
-                        keyInfoData : getFilteredKeyInfo(userId.email.toLowerCase().trim());
+        List<UnifiedKeyInfo> filteredKeyInfoData = getFilteredKeyInfo(userId.email);
 
         if (filteredKeyInfoData == null) {
             view.showLayoutEmpty();
@@ -126,6 +125,10 @@ class RemoteSelectIdentityKeyPresenter {
     }
 
     private List<UnifiedKeyInfo> getFilteredKeyInfo(String filterString) {
+        if (viewModel.isListAllKeys() || TextUtils.isEmpty(filterString)) {
+            return keyInfoData;
+        }
+        filterString = filterString.toLowerCase().trim();
         if (viewModel.filteredKeyInfo == null) {
             viewModel.filteredKeyInfo = new ArrayList<>();
             for (UnifiedKeyInfo unifiedKeyInfo : keyInfoData) {