diff --git a/modules/linux/desktop.nix b/modules/linux/desktop.nix
index c8eb31a..588337d 100644
--- a/modules/linux/desktop.nix
+++ b/modules/linux/desktop.nix
@@ -16,7 +16,7 @@
     enable = true;
     settings = {
       initial_session = {
-        command = "${pkgs.hyprland}/bin/Hyprland";
+        command = "${pkgs.uwsm}/bin/uwsm start default";
         user = "nico";
       };
       default_session = {
diff --git a/modules/linux/hyprland.nix b/modules/linux/hyprland.nix
index 4fc5318..67c9ba3 100644
--- a/modules/linux/hyprland.nix
+++ b/modules/linux/hyprland.nix
@@ -2,6 +2,7 @@
 
 {
   programs.hyprland.enable = true;
+  programs.hyprland.withUWSM = true;
   # Optional, hint electron apps to use wayland:
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
diff --git a/stow/.config/hypr/hyprland.conf b/stow/.config/hypr/hyprland.conf
index 382cb8c..0786917 100755
--- a/stow/.config/hypr/hyprland.conf
+++ b/stow/.config/hypr/hyprland.conf
@@ -19,6 +19,7 @@ exec-once = swaync &
 exec-once = ulauncher --hide-window &
 
 exec-once = systemctl status --user polkit-gnome-authentication-agent-1.service
+exec-once = uwsm finalize
 
 exec-once = steam -silent &
 
@@ -167,7 +168,7 @@ bind = $mainMod, V, exec, hyprlock
 
 bind = $mainMod, SPACE, togglefloating,
 bind = $mainMod, W, killactive,
-bind = $mainMod, M, exit,
+bind = $mainMod, M, exec, uwsm stop
 
 #bind = $mainMod, P, pseudo, # dwindle # have no clue what this does
 bind = $mainMod, F, fullscreen