diff --git a/.config/hypr/configs/binds.conf b/.config/hypr/configs/binds.conf
index 7bb2c5d7..17e82bc9 100644
--- a/.config/hypr/configs/binds.conf
+++ b/.config/hypr/configs/binds.conf
@@ -39,7 +39,8 @@ bind = SUPERSHIFT, I, exec, pypr toggle gpt && hyprctl dispatch bringactivetotop
 bind = SUPERSHIFT, B, exec, pypr toggle bluetooth && hyprctl dispatch bringactivetotop
 bind = SUPER, E, exec, pypr toggle yazi && hyprctl dispatch bringactivetotop
 bind = SUPER, D, exec, pypr toggle dots && hyprctl dispatch bringactivetotop
-bind = SUPERSHIFT, C, exec, pypr toggle cava && hyprctl dispatch bringactivetotop
+bind = SUPER, U, exec, pypr toggle topgrade-system && hyprctl dispatch bringactivetotop
+bind = SUPERSHIFT, U, exec, pypr toggle topgrade-all && hyprctl dispatch bringactivetotop
 
 # Screenshotting
 $hyprshot = ~/.config/hypr/scripts/hyprshot
diff --git a/.config/hypr/pyprland.toml b/.config/hypr/pyprland.toml
index b9c38c55..a029d173 100644
--- a/.config/hypr/pyprland.toml
+++ b/.config/hypr/pyprland.toml
@@ -10,7 +10,7 @@ force_monitor = "DP-1"
 
 [scratchpads.terminal]
 command = "kitty --class scratchpad-large"
-excludes = ["dots"]
+excludes = ["dots", "yazi", "topgrade-system", "topgrade-all"]
 lazy = true
 
 [scratchpads.yazi]
@@ -34,6 +34,14 @@ lazy = true
 command = "kitty --class scratchpad-mini cava"
 lazy = true
 
+[scratchpads.topgrade-system]
+command = "kitty --class scratchpad-large topgrade -k --only system"
+lazy = true
+
+[scratchpads.topgrade-all]
+command = "kitty --class scratchpad-large topgrade -k --no-self-update"
+lazy = true
+
 [scratchpads.bluetooth]
 command = "blueman-manager"
 animation = "fromRight"
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 6f410e05..5598d959 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -44,8 +44,8 @@
       },
       "exec-if": "which waybar-module-pacman-updates",
       "exec": "waybar-module-pacman-updates",
-      "on-click": "kitty --class center-float-large topgrade -k --only system",
-      "on-click-right": "kitty --class center-float-large topgrade -k --no-self-update"
+      "on-click": "pypr toggle topgrade-system",
+      "on-click-right": "pypr toggle topgrade-all"
     },
     "custom/arch": {
       "format": "  ",
@@ -186,7 +186,7 @@
       "source": "auto",
       "stereo": true,
       "waves": false,
-      "on-click": "kitty --class center-float-mini cava",
+      "on-click": "pypr toggle cava",
       "on-click-right": "qpwgraph",
       "on-click-middle": "easyeffects"
     },