diff --git a/home/programs/graphical/bars/eww/config/scripts/workspaces b/home/programs/graphical/bars/eww/config/scripts/workspaces
index 903182e..f8e45ed 100755
--- a/home/programs/graphical/bars/eww/config/scripts/workspaces
+++ b/home/programs/graphical/bars/eww/config/scripts/workspaces
@@ -4,8 +4,7 @@
 source "./scripts/include"
 
 if [ "$1" = "--switch" ]; then
-	$HOME/.local/bin/scripts/gui/hyprland/swap-workspace "$2" >/dev/null
-	# hyprctl dispatch workspace "$2" >/dev/null
+	hyprctl dispatch focusworkspaceoncurrentmonitor "$2" >/dev/null
 elif [ "$1" = "--loop" ]; then
 	hyprland_ipc "workspace|createworkspace|destroyworkspace" | ./scripts/workspaces.py "$@"
 else
diff --git a/home/programs/graphical/wms/hyprland/config/keybinds.nix b/home/programs/graphical/wms/hyprland/config/keybinds.nix
index 2149596..91bfa5a 100644
--- a/home/programs/graphical/wms/hyprland/config/keybinds.nix
+++ b/home/programs/graphical/wms/hyprland/config/keybinds.nix
@@ -107,15 +107,15 @@
         #
         # Switch workspace (swapping to current monitor)
         #
-        "SUPER, 1, exec, hyprland-swap-workspace 1"
-        "SUPER, 2, exec, hyprland-swap-workspace 2"
-        "SUPER, 3, exec, hyprland-swap-workspace 3"
-        "SUPER, 4, exec, hyprland-swap-workspace 4"
-        "SUPER, 5, exec, hyprland-swap-workspace 5"
-        "SUPER, 6, exec, hyprland-swap-workspace 6"
-        "SUPER, 7, exec, hyprland-swap-workspace 7"
-        "SUPER, 8, exec, hyprland-swap-workspace 8"
-        "SUPER, 9, exec, hyprland-swap-workspace 9"
+        "SUPER, 1, focusworkspaceoncurrentmonitor, 1"
+        "SUPER, 2, focusworkspaceoncurrentmonitor, 2"
+        "SUPER, 3, focusworkspaceoncurrentmonitor, 3"
+        "SUPER, 4, focusworkspaceoncurrentmonitor, 4"
+        "SUPER, 5, focusworkspaceoncurrentmonitor, 5"
+        "SUPER, 6, focusworkspaceoncurrentmonitor, 6"
+        "SUPER, 7, focusworkspaceoncurrentmonitor, 7"
+        "SUPER, 8, focusworkspaceoncurrentmonitor, 8"
+        "SUPER, 9, focusworkspaceoncurrentmonitor, 9"
 
         #
         # Move window to workspace
diff --git a/home/programs/graphical/wms/hyprland/default.nix b/home/programs/graphical/wms/hyprland/default.nix
index 166748f..7b1ce94 100644
--- a/home/programs/graphical/wms/hyprland/default.nix
+++ b/home/programs/graphical/wms/hyprland/default.nix
@@ -16,7 +16,6 @@ in {
 
   config = mkIf cfg.enable {
     home.packages = [
-      hyprPkgs.hyprland-swap-workspace
       hyprPkgs.hyprland-move-window
       pkgs.brightnessctl
       hyprPkgs.brightness
diff --git a/home/programs/graphical/wms/hyprland/packages/default.nix b/home/programs/graphical/wms/hyprland/packages/default.nix
index bbead15..f5c76ee 100644
--- a/home/programs/graphical/wms/hyprland/packages/default.nix
+++ b/home/programs/graphical/wms/hyprland/packages/default.nix
@@ -3,7 +3,6 @@
   ...
 }: let
   packages = {
-    hyprland-swap-workspace = pkgs.callPackage ./hyprland-swap-workspace {};
     hyprland-move-window = pkgs.callPackage ./hyprland-move-window {};
     brightness = pkgs.callPackage ./brightness {};
   };
diff --git a/home/programs/graphical/wms/hyprland/packages/hyprland-swap-workspace/default.nix b/home/programs/graphical/wms/hyprland/packages/hyprland-swap-workspace/default.nix
deleted file mode 100644
index 25433db..0000000
--- a/home/programs/graphical/wms/hyprland/packages/hyprland-swap-workspace/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{pkgs, ...}:
-  pkgs.writeShellScriptBin "hyprland-swap-workspace" ''
-    ${builtins.readFile ./hyprland-swap-workspace.sh}
-  ''
diff --git a/home/programs/graphical/wms/hyprland/packages/hyprland-swap-workspace/hyprland-swap-workspace.sh b/home/programs/graphical/wms/hyprland/packages/hyprland-swap-workspace/hyprland-swap-workspace.sh
deleted file mode 100644
index 64030b4..0000000
--- a/home/programs/graphical/wms/hyprland/packages/hyprland-swap-workspace/hyprland-swap-workspace.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-WORKSPACE="$1"
-
-monitors_out="$(hyprctl monitors -j)"
-focused_mon="$(echo "$monitors_out" | jq '.[] | select(.focused==true) | .id')"
-focused_wks="$(echo "$monitors_out" | jq '.[].activeWorkspace.id')"
-
-# Workspace is already focused, check on which monitor
-if echo "$focused_wks" | grep "$WORKSPACE" >/dev/null; then
-	mon_id="$(echo "$monitors_out" | jq ".[] | select(.activeWorkspace.id==$WORKSPACE) | .id")"
-
-	# If the workspace is focused on the active monitor, don't do anything (we're here).
-	# Otherwise, swap the workspaces.
-	if [ "$mon_id" -ne "$focused_mon" ]; then
-		hyprctl dispatch swapactiveworkspaces "$focused_mon" "$mon_id"
-	fi
-# Switching to an unfocused workspace, always move it to focused monitor
-else
-	hyprctl dispatch moveworkspacetomonitor "$WORKSPACE" "$focused_mon"
-	hyprctl dispatch workspace "$WORKSPACE"
-fi