diff --git a/TFI/Features/Keychain/MobileCredentialsView.swift b/TFI/Features/Keychain/MobileCredentialsView.swift
index 360bc8f5..cf13f52e 100644
--- a/TFI/Features/Keychain/MobileCredentialsView.swift
+++ b/TFI/Features/Keychain/MobileCredentialsView.swift
@@ -360,11 +360,10 @@ struct MobileIdentityEditor: View {
                     }
                     if original.usesPassword { Toggle("Remove Password", isOn: $removePassword) }
                     Picker("Store password in", selection: $draft.passwordStorage) {
-                        Text("This Device")
-                            .tag(PasswordStorage.thisDevice)
-                            .disabled(original.usesPassword && original.passwordStorage == .iCloud)
+                        Text("This Device").tag(PasswordStorage.thisDevice)
                         Text("iCloud").tag(PasswordStorage.iCloud)
                     }
+                    .disabled(original.usesPassword && original.passwordStorage == .iCloud)
                     if configuration.showsKey {
                         Picker("Key", selection: $draft.keyID) {
                             Text("None").tag(UUID?.none)
diff --git a/TFI/Features/Keychain/MobileKeyEditor.swift b/TFI/Features/Keychain/MobileKeyEditor.swift
index a29d7009..f3d6aa13 100644
--- a/TFI/Features/Keychain/MobileKeyEditor.swift
+++ b/TFI/Features/Keychain/MobileKeyEditor.swift
@@ -25,14 +25,13 @@ struct MobileKeyEditor: View {
                     }
                     if !model.isEnclave {
                         Picker("Store in", selection: $model.storage) {
-                            Text("This Device")
-                                .tag(KeyStorage.thisDevice)
-                                .disabled(!model.canSelectThisDevice)
+                            Text("This Device").tag(KeyStorage.thisDevice)
                             Text("iCloud").tag(KeyStorage.iCloud)
                             if model.mode == .generate && model.canUseEnclave {
                                 Text("Secure Enclave").tag(KeyStorage.secureEnclave)
                             }
                         }
+                        .disabled(!model.canSelectThisDevice)
                     }
                     VStack(alignment: .leading, spacing: 8) {
                         Text("Color")