diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
index 2a8edd6254..16cbdcdef5 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
@@ -104,6 +104,22 @@ public struct SyncSettingsView: View {
                     })
                 )
             }
+            .sheet(item: $selectedDevice) { device in
+                Group {
+                    if device.isThisDevice {
+                        EditDeviceView(model: model.createEditDeviceModel(device))
+                    } else {
+                        RemoveDeviceView(model: model.createRemoveDeviceModel(device))
+                    }
+                }
+                .modifier {
+                    if #available(iOS 16.0, *) {
+                        $0.presentationDetents([.medium])
+                    } else {
+                        $0
+                    }
+                }
+            }
         }
 
     }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsViewExtension.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsViewExtension.swift
index e87a6c86e0..d8b89e9581 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsViewExtension.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsViewExtension.swift
@@ -195,22 +195,6 @@ extension SyncSettingsView {
         } header: {
             Text(UserText.syncedDevicesSectionHeader)
         }
-        .sheet(item: $selectedDevice) { device in
-            Group {
-                if device.isThisDevice {
-                    EditDeviceView(model: model.createEditDeviceModel(device))
-                } else {
-                    RemoveDeviceView(model: model.createRemoveDeviceModel(device))
-                }
-            }
-            .modifier {
-                if #available(iOS 16.0, *) {
-                    $0.presentationDetents([.medium])
-                } else {
-                    $0
-                }
-            }
-        }
         .onReceive(timer) { _ in
             if selectedDevice == nil {
                 model.delegate?.refreshDevices(clearDevices: false)