diff --git a/usr/lib/systemd/user/nwg-drawer.service b/usr/lib/systemd/user/nwg-drawer.service
new file mode 100644
index 0000000..2d7c062
--- /dev/null
+++ b/usr/lib/systemd/user/nwg-drawer.service
@@ -0,0 +1,11 @@
+[Unit]
+Requires=sway-session.target
+ConditionPathExists=/usr/bin/nwg-drawer
+
+[Service]
+ExecStart=/usr/bin/nwg-drawer -r
+Restart=on-failure
+RestartSec=1
+
+[Install]
+WantedBy=sway-session.target
diff --git a/usr/lib/systemd/user/switch-top-level.service b/usr/lib/systemd/user/switch-top-level.service
index 627a5e3..d2a4fe5 100644
--- a/usr/lib/systemd/user/switch-top-level.service
+++ b/usr/lib/systemd/user/switch-top-level.service
@@ -1,5 +1,5 @@
 [Unit]
-Requires=graphical-session.target
+Requires=sway-session.target
 ConditionPathExists=/usr/share/sway/scripts/switch-top-level.py
 
 [Service]
@@ -8,4 +8,4 @@ Restart=on-failure
 RestartSec=1
 
 [Install]
-WantedBy=graphical-session.target
+WantedBy=sway-session.target