diff --git a/homeManagerModules/desktop/hyprland/README.md b/homeManagerModules/desktop/hyprland/README.md
index 923c03f1..0fecb38e 100644
--- a/homeManagerModules/desktop/hyprland/README.md
+++ b/homeManagerModules/desktop/hyprland/README.md
@@ -48,9 +48,10 @@
 
 - SUPER + {1..9}: Switch to numbered workspace.
 - SUPER + Comma: Switch to previous numbered workspace.
-- SUPER + Period: Switch to next numbered workspace.
-- SUPER + Mouse Scroll Up: Switch to previous numbered workspace.
 - SUPER + Mouse Scroll Down: Switch to next numbered workspace.
+- SUPER + Mouse Scroll Up: Switch to previous numbered workspace.
+- SUPER + Period: Switch to next numbered workspace.
+- SUPER SHIFT + Tab: Toggle workspace overview.
 - TOUCHPAD: 3 Finger Swipe Left/Right.
 
 #### Multi-Monitor Workspace Management
@@ -71,11 +72,11 @@ ______________________________________________________________________
 
 - SUPER + C: Kill focused window.
 - SUPER + F11: Show/hide top panel.
-- SUPER + TAB: Open Window list.
 - SUPER + V: Toggle floating window.
 - SUPER SHIFT + Backslash: Toggle vertical/horizontal splits (dwindle layout only).
 - SUPER SHIFT + G: Toggle groupbar.
 - SUPER SHIFT + M: Swap window for master (master layout only).
+- SUPER SHIFT + TAB: Open Window list.
 - SUPER SHIFT + W: Toggle fullscreen.
 
 #### Focus
diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix
index 6298956e..c907fe20 100644
--- a/homeManagerModules/desktop/hyprland/default.nix
+++ b/homeManagerModules/desktop/hyprland/default.nix
@@ -21,6 +21,11 @@ in {
 
     wayland.windowManager.hyprland = {
       enable = true;
+
+      plugins = [
+        pkgs.hyprlandPlugins.hyprspace
+      ];
+
       settings = import ./settings.nix {inherit config lib pkgs;};
 
       systemd = {
diff --git a/homeManagerModules/desktop/hyprland/settings.nix b/homeManagerModules/desktop/hyprland/settings.nix
index 86ec5cd2..9d9127a7 100644
--- a/homeManagerModules/desktop/hyprland/settings.nix
+++ b/homeManagerModules/desktop/hyprland/settings.nix
@@ -37,6 +37,7 @@ in {
       "$mod SHIFT,period,exec,${lib.getExe pkgs.hyprnome} --move"
       "$mod SHIFT,R,exec,${lib.getExe config.programs.rofi.package} -show run"
       "$mod SHIFT,S,movetoworkspace,special:magic"
+      "$mod SHIFT,Tab,exec,${lib.getExe config.programs.rofi.package} -show window"
       "$mod SHIFT,V,togglefloating"
       "$mod SHIFT,W,fullscreen"
       "$mod,B,exec,${lib.getExe cfg.defaultApps.webBrowser}"
@@ -55,7 +56,7 @@ in {
       "$mod,Right,changegroupactive,f"
       "$mod,S,togglespecialworkspace,magic"
       "$mod,T,exec,${lib.getExe cfg.defaultApps.terminal}"
-      "$mod,Tab,exec,${lib.getExe config.programs.rofi.package} -show window"
+      "$mod,Tab,overview:toggle"
       "CTRL ALT,M,submap,move"
       "CTRL ALT,R,submap,resize"
       "CTRL,F12,exec,${helpers.screenshot}"
@@ -190,6 +191,22 @@ in {
     ++ cfg.desktop.hyprland.laptopMonitors
     ++ cfg.desktop.hyprland.monitors;
 
+  plugin = {
+    overview = {
+      exitOnSwitch = true;
+      gaps_in = 5;
+      gaps_out = 6;
+      onBottom = true;
+      overrideGaps = true;
+      showEmptyWorkspace = true;
+      showNewWorkspace = true;
+      workspaceActiveBorder = "rgb(${config.lib.stylix.colors.base0D})";
+      workspaceBorderSize = 4;
+      workspaceInactiveBorder = "rgb(${config.lib.stylix.colors.base03})";
+      workspaceMargin = 40;
+    };
+  };
+
   windowrulev2 = [
     "center(1),class:(.blueman-manager-wrapped)"
     "center(1),class:(blueberry.py)"
diff --git a/homeManagerModules/desktop/sway/README.md b/homeManagerModules/desktop/sway/README.md
index c8407ff1..e87c1818 100644
--- a/homeManagerModules/desktop/sway/README.md
+++ b/homeManagerModules/desktop/sway/README.md
@@ -65,10 +65,10 @@ ______________________________________________________________________
 
 - SUPER + C: Kill focused window.
 - SUPER + F11: Show/hide top panel.
-- SUPER + TAB: Open Window list.
 - SUPER + V: Toggle floating window.
 - SUPER SHIFT + Backslash: Toggle vertical/horizontal splits.
 - SUPER SHIFT + G: Toggle tabbed layout.
+- SUPER SHIFT + TAB: Open Window list.
 - SUPER SHIFT + W: Toggle fullscreen.
 
 #### Focus
diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix
index 855f18af..fca99f3f 100644
--- a/homeManagerModules/desktop/sway/settings.nix
+++ b/homeManagerModules/desktop/sway/settings.nix
@@ -101,10 +101,10 @@ in {
         "${modifier}+Shift+Period" = "move container to workspace next; workspace next";
         "${modifier}+Shift+R" = "exec ${lib.getExe config.programs.rofi.package} -show run";
         "${modifier}+Shift+S" = "move scratchpad";
+        "${modifier}+Shift+Tab" = "exec ${lib.getExe config.programs.rofi.package} -show window";
         "${modifier}+Shift+V" = "floating toggle";
         "${modifier}+Shift+W" = "fullscreen toggle";
         "${modifier}+T" = "exec ${lib.getExe cfg.defaultApps.terminal}";
-        "${modifier}+Tab" = "exec ${lib.getExe config.programs.rofi.package} -show window";
         "Control+F12" = "exec ${helpers.screenshot}";
         "Ctrl+Mod1+M" = "mode move";
         "Ctrl+Mod1+R" = "mode resize";