diff --git a/modules/applications/sway/dunst.nix b/modules/applications/dunst.nix
similarity index 92%
rename from modules/applications/sway/dunst.nix
rename to modules/applications/dunst.nix
index 2504581..c81bc86 100644
--- a/modules/applications/sway/dunst.nix
+++ b/modules/applications/dunst.nix
@@ -2,6 +2,7 @@
 let
   cfg = config.this.application.dunst;
   sway = config.this.application.sway;
+  graphical = config.this.graphical;
 in with lib; {
   options = {
     this.application.dunst.enable = mkOption {
@@ -77,8 +78,9 @@ in with lib; {
     };
     systemd.user.services.dunst = {
       enable = true;
-      description = "dunst foo";
-      wantedBy = [ "sway-session.target" ];
+      description = "Dunst";
+      wantedBy = [ "graphical-session.target" ]
+        ++ optional sway.enable [ "sway-session.target" ];
       partOf = [ "graphical-session.target" ];
       serviceConfig = {
         ExecStart = ''
diff --git a/modules/applications/sway/default.nix b/modules/applications/sway/default.nix
index 4aefbc3..77826c2 100644
--- a/modules/applications/sway/default.nix
+++ b/modules/applications/sway/default.nix
@@ -1,3 +1,3 @@
 { config, pkgs, ... }: {
-  imports = [ ./dunst.nix ./sway.nix ./gammastep.nix ./mako.nix ./waybar.nix ];
+  imports = [ ./sway.nix ./gammastep.nix ./mako.nix ./waybar.nix ];
 }