diff --git a/hypr/hyprland-window-switcher.sh b/hypr/hyprland-window-switcher.sh
new file mode 100755
index 0000000..7724626
--- /dev/null
+++ b/hypr/hyprland-window-switcher.sh
@@ -0,0 +1 @@
+hyprctl dispatch focuswindow address:"$(hyprctl -j clients | jq -r '.[]|select(.address != ""  and .title != "")|(.class + "\t" + .address + "\t" + .title)' | wofi --show dmenu | cut -f2)"
diff --git a/hypr/rofi.conf b/hypr/rofi.conf
index aa4bdf2..ca639fa 100644
--- a/hypr/rofi.conf
+++ b/hypr/rofi.conf
@@ -1,6 +1,6 @@
 bind = $mainMod, R, exec, ~/.config/rofi/launchers/type-6/launcher.sh -m drun
 bind = $mainMod, B, exec, ~/.config/rofi/launchers/type-6/launcher.sh -m run
-bind = $mainMod, W, exec, ~/.config/rofi/launchers/type-6/launcher.sh -m window
+bind = $mainMod, W, exec, ~/.config/hypr/hyprland-window-switcher.sh
 bind = $mainMod_ALT, B, exec, ~/.config/rofi/launchers/type-6/launcher.sh -m filebrowser
 bind = $mainMod, X, exec, ~/.config/rofi/powermenu/type-6/powermenu.sh
 bind = $secondaryMod, V, exec, ~/.config/rofi/applets/bin/volume.sh