diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
index 25033658d..6d0e6556f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
@@ -86,16 +86,17 @@ public class CertifyKeySpinner extends KeySpinner {
         super.onLoadFinished(loader, data);
 
         if (loader.getId() == LOADER_ID) {
-            // If there is only one choice, pick it by default
-            if (mAdapter.getCount() == 2) {
-                // preselect if key can certify
-                if (data.moveToPosition(1) && !data.isNull(mIndexHasCertify)) {
-                    setSelection(1);
-                }
-            }
             mIndexHasCertify = data.getColumnIndex(KeychainContract.KeyRings.HAS_CERTIFY);
             mIndexIsRevoked = data.getColumnIndex(KeychainContract.KeyRings.IS_REVOKED);
             mIndexIsExpired = data.getColumnIndex(KeychainContract.KeyRings.IS_EXPIRED);
+
+            // If there is only one choice, pick it by default
+            if (mAdapter.getCount() == 2) {
+                // preselect if key can certify
+                if (data.moveToPosition(0) && !data.isNull(mIndexHasCertify)) {
+                    setSelection(1);
+                }
+            }
         }
     }