diff --git a/modules/applications/sway/mako.nix b/modules/applications/sway/mako.nix
index a9c20b0..556bbad 100644
--- a/modules/applications/sway/mako.nix
+++ b/modules/applications/sway/mako.nix
@@ -53,7 +53,7 @@ in with lib; {
     systemd.user.services.mako = {
       enable = true;
       description = "Mako foo";
-      wantedBy = [ "graphical-session.target" ];
+      wantedBy = [ "sway-session.target" ];
       partOf = [ "graphical-session.target" ];
       serviceConfig = {
         ExecStart = ''
diff --git a/modules/applications/sway/sway.nix b/modules/applications/sway/sway.nix
index 065a605..ceb1fc4 100644
--- a/modules/applications/sway/sway.nix
+++ b/modules/applications/sway/sway.nix
@@ -61,9 +61,10 @@ in with lib; {
     };
 
     systemd.user.services.sway = {
+      enable = true;
       description = "Sway - Wayland window manager";
       documentation = [ "man:sway(5)" ];
-      bindsTo = [ "graphical-session.target" ];
+      bindsTo = [ "default.target" ];
       wants = [ "graphical-session-pre.target" ];
       after = [ "graphical-session-pre.target" ];
       # We explicitly unset PATH here, as we want it to be set by