diff --git a/ui/imports/shared/views/SyncingCodeInstructions.qml b/ui/imports/shared/views/SyncingCodeInstructions.qml
index bb406d3d8b..c7391caa7d 100644
--- a/ui/imports/shared/views/SyncingCodeInstructions.qml
+++ b/ui/imports/shared/views/SyncingCodeInstructions.qml
@@ -42,16 +42,13 @@ ColumnLayout {
     }
 
     StackLayout {
-        Layout.fillWidth: false
         Layout.alignment: Qt.AlignHCenter
-        implicitWidth: Math.max(mobileSync.implicitWidth, desktopSync.implicitWidth)
-        implicitHeight: Math.max(mobileSync.implicitHeight, desktopSync.implicitHeight)
+        Layout.fillWidth: true
+        Layout.preferredHeight: Math.max(mobileSync.implicitHeight, desktopSync.implicitHeight)
         currentIndex: switchTabBar.currentIndex
 
         GetSyncCodeMobileInstructions {
             id: mobileSync
-            Layout.fillHeight: true
-            Layout.fillWidth: false
             Layout.alignment: Qt.AlignHCenter
 
             purpose: root.purpose
@@ -60,8 +57,6 @@ ColumnLayout {
 
         GetSyncCodeDesktopInstructions {
             id: desktopSync
-            Layout.fillHeight: true
-            Layout.fillWidth: false
             Layout.alignment: Qt.AlignHCenter
 
             purpose: root.purpose
diff --git a/ui/imports/shared/views/SyncingDeviceView.qml b/ui/imports/shared/views/SyncingDeviceView.qml
index cb14b96aaa..fe03689b59 100644
--- a/ui/imports/shared/views/SyncingDeviceView.qml
+++ b/ui/imports/shared/views/SyncingDeviceView.qml
@@ -15,7 +15,7 @@ import SortFilterProxyModel 0.2
 Item {
     id: root
 
-    property alias devicesModel: sfpModel.sourceModel
+    property var devicesModel
     property string userDisplayName
     property string userColorId
     property string userColorHash
@@ -177,7 +177,7 @@ Item {
             clip: true
 
             model: SortFilterProxyModel {
-                id: sfpModel
+                sourceModel: root.devicesModel
                 filters: [
                     ValueFilter {
                         enabled: true