diff --git a/Panes/Overview.qml b/Panes/Overview.qml
index c4448e1..9d8a450 100644
--- a/Panes/Overview.qml
+++ b/Panes/Overview.qml
@@ -15,6 +15,10 @@ Grid {
     columns: 5
     horizontalItemAlignment: Grid.AlignHCenter
     verticalItemAlignment: Grid.AlignVCenter
+    onVisibleChanged: {
+        if (!visible) return
+        Hyprland.refreshToplevels()
+    }
     component WorkspaceView: ClippingRectangle {
         color: "#282828"
         width: 192
@@ -53,11 +57,12 @@ Grid {
                 ScreencopyView {
                     anchors.fill: parent
                     captureSource: modelData.wayland
-                    live: background.index == 7
+                    live: overview.visible
                 }
             }
         }
         TapHandler { onTapped: {
+            if (modelData < 0) return
             Hyprland.dispatch(`hl.dsp.focus({workspace = ${modelData + 1}})`)
             root.close()
         }}
@@ -70,5 +75,11 @@ Grid {
     WorkspaceView {
         modelData: -100 
         bottomRightRadius: 12
+        TapHandler {
+            onTapped: {
+                Hyprland.dispatch(`hl.dsp.workspace.toggle_special()`)
+                root.close()
+            }
+        }
     }
 }
diff --git a/TopBar.qml b/TopBar.qml
index e6e1486..eaddce4 100644
--- a/TopBar.qml
+++ b/TopBar.qml
@@ -13,10 +13,11 @@ PanelWindow {
     id: root
     anchors {
         top: true
+        left: true
+        right: true
     }
     property var font: {family: "0xProto Nerd Font"}
     
-    implicitWidth: 1024
     implicitHeight: 400
     WlrLayershell.keyboardFocus: (up && !background.exit.running && !shortcut.pressed && background.index <= 1) ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
     WlrLayershell.layer: WlrLayer.Overlay