diff --git a/apps/ios/Shared/Views/ChatList/UserPicker.swift b/apps/ios/Shared/Views/ChatList/UserPicker.swift
index fe936e60f9..0d5f0249fa 100644
--- a/apps/ios/Shared/Views/ChatList/UserPicker.swift
+++ b/apps/ios/Shared/Views/ChatList/UserPicker.swift
@@ -10,13 +10,15 @@ struct UserPicker: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
-    @Environment(\.scenePhase) var scenePhase
-    @Environment(\.colorScheme) var colorScheme
+    @Environment(\.scenePhase) private var scenePhase: ScenePhase
+    @Environment(\.colorScheme) private var colorScheme: ColorScheme
+    @Environment(\.dismiss) private var dismiss: DismissAction
     @Binding var activeSheet: UserPickerSheet?
+    @State private var switchingProfile = false
 
     var body: some View {
         if #available(iOS 16.0, *) {
-            let v = viewBody.presentationDetents([.height(410)])
+            let v = viewBody.presentationDetents([.height(420)])
             if #available(iOS 16.4, *) {
                 v.scrollBounceBehavior(.basedOnSize)
             } else {
@@ -119,6 +121,7 @@ struct UserPicker: View {
             }
         }
         .modifier(ThemedBackground(grouped: true))
+        .disabled(switchingProfile)
     }
         
     private func userPickerRow(_ users: [UserInfo], size: CGFloat) -> some View {
@@ -193,14 +196,17 @@ struct UserPicker: View {
         }
         .frame(width: size)
         .onTapGesture {
+            switchingProfile = true
             Task {
                 do {
                     try await changeActiveUserAsync_(u.user.userId, viewPwd: nil)
                     await MainActor.run {
-                        activeSheet = nil
+                        switchingProfile = false
+                        dismiss()
                     }
                 } catch {
                     await MainActor.run {
+                        switchingProfile = false
                         AlertManager.shared.showAlertMsg(
                             title: "Error switching profile!",
                             message: "Error: \(responseError(error))"
diff --git a/apps/ios/Shared/Views/UserSettings/UserProfilesView.swift b/apps/ios/Shared/Views/UserSettings/UserProfilesView.swift
index cc7c5b5e7e..330ce56e0b 100644
--- a/apps/ios/Shared/Views/UserSettings/UserProfilesView.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserProfilesView.swift
@@ -10,7 +10,6 @@ struct UserProfilesView: View {
     @EnvironmentObject private var m: ChatModel
     @EnvironmentObject private var theme: AppTheme
     @Environment(\.editMode) private var editMode
-    @Environment(\.dismiss) var dismiss: DismissAction
     @AppStorage(DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE) private var showHiddenProfilesNotice = true
     @AppStorage(DEFAULT_SHOW_MUTE_PROFILE_ALERT) private var showMuteProfileAlert = true
     @State private var showDeleteConfirmation = false
@@ -284,7 +283,7 @@ struct UserProfilesView: View {
                     await MainActor.run {
                         onboardingStageDefault.set(.step1_SimpleXInfo)
                         m.onboardingStage = .step1_SimpleXInfo
-                        dismiss()
+                        dismissAllSheets()
                     }
                 }
             } else {
@@ -307,7 +306,7 @@ struct UserProfilesView: View {
             Task {
                 do {
                     try await changeActiveUserAsync_(user.userId, viewPwd: userViewPassword(user))
-                    dismiss()
+                    dismissAllSheets()
                 } catch {
                     await MainActor.run { alert = .activateUserError(error: responseError(error)) }
                 }