diff --git a/ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift b/ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift
index 5444d9957..6ca3c27bd 100644
--- a/ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift
@@ -27,7 +27,7 @@ struct ServerConfirmationScreen: View {
         }
         .background()
         .environment(\.backgroundStyle, AnyShapeStyle(Color.compound.bgCanvasDefault))
-        .introspect(.window, on: .iOS(.v16)) { window in
+        .introspect(.window, on: .iOS(.v16, .v17)) { window in
             context.send(viewAction: .updateWindow(window))
         }
     }
diff --git a/ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift b/ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift
index a5ab9dfd6..9731cf67c 100644
--- a/ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift
+++ b/ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift
@@ -49,7 +49,7 @@ struct SoftLogoutScreen: View {
         }
         .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
         .alert(item: $context.alertInfo)
-        .introspect(.window, on: .iOS(.v16)) { window in
+        .introspect(.window, on: .iOS(.v16, .v17)) { window in
             context.send(viewAction: .updateWindow(window))
         }
     }
diff --git a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
index 696616a5f..7faaf5bd8 100644
--- a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
@@ -46,7 +46,7 @@ struct SettingsScreen: View {
                 doneButton
             }
         }
-        .introspect(.window, on: .iOS(.v16)) { window in
+        .introspect(.window, on: .iOS(.v16, .v17)) { window in
             context.send(viewAction: .updateWindow(window))
         }
     }