diff --git a/quickshell/Services/CompositorService.qml b/quickshell/Services/CompositorService.qml
index 90746b11..272ab3f2 100644
--- a/quickshell/Services/CompositorService.qml
+++ b/quickshell/Services/CompositorService.qml
@@ -358,8 +358,12 @@ Singleton {
 
             ordered.push.apply(ordered, arr);
         }
-
-        return ordered.map(x => x.wayland).filter(w => w !== null && w !== undefined);
+        return ordered.map(x => {
+            if (!x.wayland)
+                return null;
+            x.wayland.address = x.address;
+            return x.wayland;
+        }).filter(w => w !== null && w !== undefined);
     }
 
     function filterCurrentWorkspace(toplevels, screen) {
diff --git a/quickshell/Services/HyprlandService.qml b/quickshell/Services/HyprlandService.qml
index 2e5371f8..295a1902 100644
--- a/quickshell/Services/HyprlandService.qml
+++ b/quickshell/Services/HyprlandService.qml
@@ -355,7 +355,7 @@ decoration {
 
     function focusWindow(windowAddress) {
       if (Hyprland.usingLua) {
-        Hyprland.dispatch(`hl.dsp.focus({window = "address:${windowAddress}"})`);
+        Hyprland.dispatch(`hl.dsp.focus({window = "address:0x${windowAddress}"})`);
       } else  {
         Hyprland.dispatch(`focuswindow address:${windowAddress}`);
       }