diff --git a/src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java b/src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java
index 9bb652248..095772ec2 100644
--- a/src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java
+++ b/src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java
@@ -207,6 +207,10 @@ public class SelectPublicKeyListAdapter extends BaseAdapter {
 
         CheckBox selected = (CheckBox) view.findViewById(R.id.selected);
 
+        if (!enabled) {
+            mParent.setItemChecked(position, false);
+        }
+
         selected.setChecked(mParent.isItemChecked(position));
 
         view.setEnabled(enabled);