diff --git a/.config/hypr/hyprland/keybinds.conf b/.config/hypr/hyprland/keybinds.conf
index ca723b8df..e29dcaba5 100644
--- a/.config/hypr/hyprland/keybinds.conf
+++ b/.config/hypr/hyprland/keybinds.conf
@@ -25,7 +25,6 @@ bindit = ,Super_R, global, quickshell:workspaceNumber # [hidden]
 bindd = Super, V, Clipboard history >> clipboard, global, quickshell:overviewClipboardToggle # Clipboard history >> clipboard
 bindd = Super, Period, Emoji >> clipboard, global, quickshell:overviewEmojiToggle # Emoji >> clipboard
 bindd = Super, Tab, Toggle overview, global, quickshell:overviewToggle # [hidden] Toggle overview/launcher (alt)
-bindd = Super, Comma, Toggle wallpaper overview, global, quickshell:wallpaperOverviewToggle # Wallpaper overview
 bindd = Super, A, Toggle left sidebar, global, quickshell:sidebarLeftToggle # Toggle left sidebar
 bind = Super+Alt, A, global, quickshell:sidebarLeftToggleDetach # [hidden]
 bind = Super, B, global, quickshell:sidebarLeftToggle # [hidden]
@@ -49,7 +48,8 @@ bindld = Super+Shift,M, Toggle mute, exec, wpctl set-mute @DEFAULT_SINK@ toggle
 bindl = Alt ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle # [hidden]
 bindl = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle # [hidden]
 bindld = Super+Alt,M, Toggle mic, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle # [hidden]
-bindd = Ctrl+Super, T, Change wallpaper, exec, ~/.config/quickshell/$qsConfig/scripts/colors/switchwall.sh # Change wallpaper
+bindd = Ctrl+Super, T, Toggle wallpaper selector, global, quickshell:wallpaperSelectorToggle # Wallpaper selector
+bindd = Ctrl+Super, T, Change wallpaper, exec, qs -c $qsConfig ipc call TEST_ALIVE || ~/.config/quickshell/$qsConfig/scripts/colors/switchwall.sh # [hidden] Change wallpaper (fallback)
 bind = Ctrl+Super, R, exec, killall ags agsv1 gjs ydotool qs quickshell; qs -c $qsConfig & # Restart widgets
 
 ##! Utilities
diff --git a/.config/quickshell/ii/GlobalStates.qml b/.config/quickshell/ii/GlobalStates.qml
index 57ce3b4cc..f2836c99b 100644
--- a/.config/quickshell/ii/GlobalStates.qml
+++ b/.config/quickshell/ii/GlobalStates.qml
@@ -17,7 +17,7 @@ Singleton {
     property bool osdVolumeOpen: false
     property bool oskOpen: false
     property bool overviewOpen: false
-    property bool wallpaperOverviewOpen: false
+    property bool wallpaperSelectorOpen: false
     property bool screenLocked: false
     property bool screenLockContainsCharacters: false
     property bool screenUnlockFailed: false
diff --git a/.config/quickshell/ii/modules/wallpaperOverview/WallpaperOverview.qml b/.config/quickshell/ii/modules/wallpaperSelector/WallpaperSelector.qml
similarity index 96%
rename from .config/quickshell/ii/modules/wallpaperOverview/WallpaperOverview.qml
rename to .config/quickshell/ii/modules/wallpaperSelector/WallpaperSelector.qml
index 667f2015e..645a125c6 100644
--- a/.config/quickshell/ii/modules/wallpaperOverview/WallpaperOverview.qml
+++ b/.config/quickshell/ii/modules/wallpaperSelector/WallpaperSelector.qml
@@ -15,14 +15,15 @@ Scope {
     id: scope
 
     Loader {
-        active: GlobalStates.wallpaperOverviewOpen
+        active: GlobalStates.wallpaperSelectorOpen
+
         sourceComponent: PanelWindow {
             id: root
             readonly property HyprlandMonitor monitor: Hyprland.monitorFor(root.screen)
             property bool monitorIsFocused: (Hyprland.focusedMonitor?.id == monitor?.id)
             property var filteredWallpapers: Wallpapers.wallpapers
 
-            WlrLayershell.namespace: "quickshell:wallpaper-overview"
+            WlrLayershell.namespace: "quickshell:wallpaperSelector"
             WlrLayershell.layer: WlrLayer.Overlay
             WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
             color: "transparent"
@@ -99,7 +100,7 @@ Scope {
                             if (filterField.text.length > 0) {
                                 filterField.text = "";
                             } else {
-                                GlobalStates.wallpaperOverviewOpen = false;
+                                GlobalStates.wallpaperSelectorOpen = false;
                             }
                             event.accepted = true;
                         }
@@ -144,7 +145,7 @@ Scope {
 
                     Keys.onPressed: event => {
                         if (event.key === Qt.Key_Escape) {
-                            GlobalStates.wallpaperOverviewOpen = false;
+                            GlobalStates.wallpaperSelectorOpen = false;
                             event.accepted = true;
                         } else if (event.key === Qt.Key_Left) {
                             grid.moveSelection(-1);
@@ -231,7 +232,7 @@ Scope {
                                 const path = model[currentIndex];
                                 if (!path)
                                     return;
-                                GlobalStates.wallpaperOverviewOpen = false;
+                                GlobalStates.wallpaperSelectorOpen = false;
                                 filterField.text = "";
                                 Wallpapers.apply(path);
                             }
@@ -332,7 +333,7 @@ Scope {
                                         parent.isHovered = false;
                                     }
                                     onClicked: {
-                                        GlobalStates.wallpaperOverviewOpen = false;
+                                        GlobalStates.wallpaperSelectorOpen = false;
                                         filterField.text = "";
                                         Wallpapers.apply(modelData);
                                     }
@@ -392,8 +393,8 @@ Scope {
 
             Connections {
                 target: GlobalStates
-                function onWallpaperOverviewOpenChanged() {
-                    if (GlobalStates.wallpaperOverviewOpen && monitorIsFocused) {
+                function onwallpaperSelectorOpenChanged() {
+                    if (GlobalStates.wallpaperSelectorOpen && monitorIsFocused) {
                         filterField.forceActiveFocus();
                     }
                 }
@@ -402,10 +403,10 @@ Scope {
     }
 
     GlobalShortcut {
-        name: "wallpaperOverviewToggle"
-        description: "Toggle wallpaper overview"
+        name: "wallpaperSelectorToggle"
+        description: "Toggle wallpaper selector"
         onPressed: {
-            GlobalStates.wallpaperOverviewOpen = !GlobalStates.wallpaperOverviewOpen;
+            GlobalStates.wallpaperSelectorOpen = !GlobalStates.wallpaperSelectorOpen;
         }
     }
 }
diff --git a/.config/quickshell/ii/shell.qml b/.config/quickshell/ii/shell.qml
index b135f5924..56dc75ff0 100644
--- a/.config/quickshell/ii/shell.qml
+++ b/.config/quickshell/ii/shell.qml
@@ -18,12 +18,12 @@ import "./modules/notificationPopup/"
 import "./modules/onScreenDisplay/"
 import "./modules/onScreenKeyboard/"
 import "./modules/overview/"
-import "./modules/wallpaperOverview/"
 import "./modules/screenCorners/"
 import "./modules/session/"
 import "./modules/sidebarLeft/"
 import "./modules/sidebarRight/"
 import "./modules/verticalBar/"
+import "./modules/wallpaperSelector/"
 
 import QtQuick
 import QtQuick.Window
@@ -44,13 +44,13 @@ ShellRoot {
     property bool enableOnScreenDisplayVolume: true
     property bool enableOnScreenKeyboard: true
     property bool enableOverview: true
-    property bool enableWallpaperOverview: true
     property bool enableReloadPopup: true
     property bool enableScreenCorners: true
     property bool enableSession: true
     property bool enableSidebarLeft: true
     property bool enableSidebarRight: true
     property bool enableVerticalBar: true
+    property bool enableWallpaperSelector: true
 
     // Force initialization of some singletons
     Component.onCompleted: {
@@ -72,12 +72,12 @@ ShellRoot {
     LazyLoader { active: enableOnScreenDisplayVolume; component: OnScreenDisplayVolume {} }
     LazyLoader { active: enableOnScreenKeyboard; component: OnScreenKeyboard {} }
     LazyLoader { active: enableOverview; component: Overview {} }
-    LazyLoader { active: enableWallpaperOverview; component: WallpaperOverview {} }
     LazyLoader { active: enableReloadPopup; component: ReloadPopup {} }
     LazyLoader { active: enableScreenCorners; component: ScreenCorners {} }
     LazyLoader { active: enableSession; component: Session {} }
     LazyLoader { active: enableSidebarLeft; component: SidebarLeft {} }
     LazyLoader { active: enableSidebarRight; component: SidebarRight {} }
     LazyLoader { active: enableVerticalBar && Config.ready && Config.options.bar.vertical; component: VerticalBar {} }
+    LazyLoader { active: enableWallpaperSelector; component: WallpaperSelector {} }
 }