diff --git a/activate_linux/shell.qml b/activate_linux/shell.qml
index 70d85a9..101fa1a 100644
--- a/activate_linux/shell.qml
+++ b/activate_linux/shell.qml
@@ -6,11 +6,14 @@ import Quickshell.Wayland
 ShellRoot {
 	Variants {
 		// Create the panel once on each monitor.
-		variants: Quickshell.screens.map(screen => ({ screen }))
+		model: Quickshell.screens
 
 		PanelWindow {
 			id: w
 
+			property var modelData
+			screen: modelData
+
 			anchors {
 				right: true
 				bottom: true
diff --git a/wlogout/WLogout.qml b/wlogout/WLogout.qml
index ffabf11..4a0f17c 100644
--- a/wlogout/WLogout.qml
+++ b/wlogout/WLogout.qml
@@ -11,10 +11,13 @@ Variants {
 	property color buttonHoverColor: "#3700b3"
 	default property list<LogoutButton> buttons
 
-	variants: Quickshell.screens.map(screen => ({ screen }))
+	model: Quickshell.screens
 	PanelWindow {
 		id: w
 
+		property var modelData
+		screen: modelData
+
 		exclusionMode: ExclusionMode.Ignore
 		WlrLayershell.layer: WlrLayer.Overlay
 		WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive