diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 205269a..4d17a74 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -265,6 +265,10 @@ focus_follows_mouse no
 
 for_window [app_id="pavucontrol"] floating enable
 
+# Start the systemd-user target for sway and import environment
+# Makes service management a bit cleaner
+exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"
+
 exec nm-applet --indicator
 exec blueman-applet
 exec mako --config ~/.config/mako/mako.conf
diff --git a/sway/.config/systemd/user/sway-session.target b/sway/.config/systemd/user/sway-session.target
new file mode 100644
index 0000000..a6dadf9
--- /dev/null
+++ b/sway/.config/systemd/user/sway-session.target
@@ -0,0 +1,6 @@
+[Unit]
+Description=Sway compositor session
+Documentation=man:systemd.special
+BindsTo=graphical-session.target
+Wants=graphical-session-pre.target
+After=graphical-session-pre.target