diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
index 27be55b8a..8ac45c6d8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
@@ -101,6 +101,10 @@ public class KeySpinner extends AppCompatSpinner {
     }
 
     private void maybeSelectPreselection(List<UnifiedKeyInfo> keyInfos) {
+        if (spinnerAdapter.hasNoneItem() && keyInfos.size() == 1) {
+            setSelection(1);
+            return;
+        }
         if (preSelectedKeyId == null) {
             return;
         }