diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/SetBackupBasswordView/SetBackupPasswordView.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/SetBackupBasswordView/SetBackupPasswordView.swift
index 8e0d7cf745c..f7deb8d45b8 100644
--- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/SetBackupBasswordView/SetBackupPasswordView.swift
+++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/SetBackupBasswordView/SetBackupPasswordView.swift
@@ -24,6 +24,8 @@ struct SetBackupPasswordView: View {
 
     @StateObject var viewModel: SetBackupPasswordViewModel
 
+    var focusPasswordFieldOnAppear = true
+
     @Environment(\.wireAccentColor) private var wireAccentColor
     @Environment(\.wireAccentColorMapping) private var wireAccentColorMapping
 
@@ -98,7 +100,7 @@ struct SetBackupPasswordView: View {
             password: $viewModel.password,
             placeholder: Strings.ExportBackup.SetBackupPassword.placeholder,
             placeholderColor: passwordFieldPlaceholderColor,
-            focusOnAppear: true
+            focusOnAppear: focusPasswordFieldOnAppear
         )
         .tint(passwordFieldBorderColor)
     }
diff --git a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/SetBackupPasswordViewSnapshotTests.swift b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/SetBackupPasswordViewSnapshotTests.swift
index bb6796f2a9e..eea8e5b95ac 100644
--- a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/SetBackupPasswordViewSnapshotTests.swift
+++ b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/SetBackupPasswordViewSnapshotTests.swift
@@ -47,7 +47,7 @@ final class SetBackupPasswordViewSnapshotTests: XCTestCase {
             setPasswordAction: { _ in }
         )
         viewModel.password = "invalid"
-        let sut = SetBackupPasswordView(viewModel: viewModel)
+        let sut = SetBackupPasswordView(viewModel: viewModel, focusPasswordFieldOnAppear: false)
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         snapshotHelper
@@ -66,7 +66,7 @@ final class SetBackupPasswordViewSnapshotTests: XCTestCase {
             setPasswordAction: { _ in }
         )
         viewModel.password = "G00dPassword"
-        let sut = SetBackupPasswordView(viewModel: viewModel)
+        let sut = SetBackupPasswordView(viewModel: viewModel, focusPasswordFieldOnAppear: false)
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         snapshotHelper
@@ -84,7 +84,7 @@ final class SetBackupPasswordViewSnapshotTests: XCTestCase {
             cancelAction: {},
             setPasswordAction: { _ in }
         )
-        let sut = SetBackupPasswordView(viewModel: viewModel)
+        let sut = SetBackupPasswordView(viewModel: viewModel, focusPasswordFieldOnAppear: false)
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         snapshotHelper
@@ -99,7 +99,7 @@ final class SetBackupPasswordViewSnapshotTests: XCTestCase {
             cancelAction: {},
             setPasswordAction: { _ in }
         )
-        let sut = SetBackupPasswordView(viewModel: viewModel)
+        let sut = SetBackupPasswordView(viewModel: viewModel, focusPasswordFieldOnAppear: false)
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         for dynamicTypeSize in DynamicTypeSize.allCases {
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testColorSchemeVariants.dark.png
index acf33ff371b..8ba2b697634 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testColorSchemeVariants.dark.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testColorSchemeVariants.dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9c8de888ea0dacf2a4d9c366a550c87c51e95131fe05c9209098b1e58fbfd99
-size 153890
+oid sha256:24153b4183c6d2dc449a3faeb8e35a23ee5625a476a8911d047926fe23227be3
+size 153747
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility1.png
index 32236e2ca82..58e79996a72 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility1.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:836f7ef20bf93b85ddef0eb0f67662f9236a25dffff7aab06a857476fdcc3573
-size 209340
+oid sha256:c939a461d068e3d0362dc901a81cd1a9ed8cf4c271740364700f67f2be12cf38
+size 208916
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility2.png
index f9a01feaadd..bd71b7f387b 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility2.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5ae4e3827c3a2eb451c49b9b9587db8e1107df41098c244aa1281fd95adcfb0
-size 232926
+oid sha256:afa77043e428083f83bde275a98ee1bd28ea8a11d4ed27467acdaf24c8f29531
+size 232422
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility3.png
index 171b7fbb09d..739d6adc5e9 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility3.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0c5f61b8495336f1ea492d8a109d24efd945ca9d6db27c91f7af0d7ebc5edfd
-size 269533
+oid sha256:d58ba47414fcfa1db5e20bc3a0872b0ee9a43674d6db6b15dbaaf69f43af95b2
+size 269152
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.large.png
index 3ff99e6d19f..eeea85bb97b 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.large.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af6d3e22fddffd2bafe1d86c0a97cfb51b308f01a865b5d9b5f9c4c40e07559b
-size 153068
+oid sha256:274acd5e96ecd6122be45169d34444af6e34316b7c8cccbef655d7a184918a56
+size 152744
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.medium.png
index 3e5936e1ec6..d43274fd1de 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.medium.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.medium.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ee89539b058cafe6d4c9659b7910deecfef6dd3a4c5ee6e05a383d9e4a7d4e3
-size 149153
+oid sha256:df3845fc37ed2dfd829d45a48d45e568ead6e60f3dc6a3159e3aacca10824836
+size 148770
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.small.png
index cf6c1325c6f..ef6ec073a31 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.small.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.small.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7f18f9116ed9935febaa704587f39142473dd70beea4e6582330b5189ed1101
-size 143304
+oid sha256:c9419b3fb602ca4ccaf0ae26a5a01aa195cfac1ba58b7dcd2da6516cb3ba96a5
+size 142962
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xLarge.png
index eddefe0b201..d5c9935b685 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xLarge.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4606d46782797e4cc09fe6aa25404623ed7088030a466a602bdd6d2f09130ed1
-size 163311
+oid sha256:8a3b33012af68120f92348e797b06ab6b4c6f08aba36f48ce6aab59855df3585
+size 162893
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xSmall.png
index 7a27d50056b..5d71601191d 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xSmall.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xSmall.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd2323368230a5aead88be8e490cef7f7d994df82d387d11ebe51e9d370f2c0c
-size 139446
+oid sha256:7ec18aadc0a7b369455df9e4ac2e5a65e21f599d5a4422c934cd22a6ae535d28
+size 139087
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxLarge.png
index 3c0cc928841..75223589ac2 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxLarge.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84d3387ed4e864d6a1fe8b2d8902032c5ad114f9959edbd068f22fdb408695c6
-size 173553
+oid sha256:d33e97361733718dcf49ba322cc2617ddc467169bad1290eb9beba1267394d1d
+size 173184
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png
index 3987c94dcf2..72f455e75b9 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0db7560257b469eb7eff9c980720c227c99151c3342c689913449addf469aa41
-size 182959
+oid sha256:91e709ebb9dd29b33a30fdd5aa727f846614c523000932789ff560b3ee5e21e9
+size 182521
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.dark.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.dark.png
index 1ca5d40f1f0..a8202fa80e4 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.dark.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54c76247b6437b2bf1516a812375daa128304576cef4e1f876bb8d7e66bda8d0
-size 148878
+oid sha256:f74ff0eb4cffde859b6befab6373c787eeb5e837bfc44c5dc9486d9bdf58a603
+size 148378
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.light.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.light.png
index f04204644cf..457369c4476 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.light.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f393f0d2471591d51a0a98bdc6ae697bde69f82248bc6edca2e18916a84d18a1
-size 148580
+oid sha256:c3bc739cdae77e8a226987434f4f0e7f1ddd055c0977fc739abfbcfab039113a
+size 148133
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.dark.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.dark.png
index f2af719ecf6..40d71026ca2 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.dark.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c58875af745fbc2061fb5670a9009549acdbc925d77f165aa550b96b7aa58dae
-size 148988
+oid sha256:4d32550e5cf78e4b00e0514ec876fde96083f927855af24577345432009b01f5
+size 148475
diff --git a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.light.png b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.light.png
index 391e51adf53..af978f641ac 100644
--- a/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.light.png
+++ b/WireUI/Tests/WireSettingsUITests/Resources/ReferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c2112e54a089e2ee665bd3bbfdf47245032a6129071ea8d132f5266feb4087b
-size 148687
+oid sha256:45d0d85a93f33a290a73fbaa3596a490591d094821df47b59a2192f5312bd631
+size 148237