diff --git a/fish/.config/fish/conf.d/setup.fish b/fish/.config/fish/conf.d/setup.fish
index c47d655..bc4f786 100644
--- a/fish/.config/fish/conf.d/setup.fish
+++ b/fish/.config/fish/conf.d/setup.fish
@@ -65,9 +65,6 @@ function __fish_setup_on_tty_login --description "Set up environment on tty logi
 
   mkdir -p /tmp/gst-dot
   set -Ux GST_DEBUG_DUMP_DOT_DIR /tmp/gst-dot
-
-  # Start all tmux sessions on login
-  ~/.tmux/session-setup.sh
 end
 
 # Instead of tty check, we would have liked to do this using status is-login
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 3125341..8b38725 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -268,3 +268,5 @@ for_window [title="Firefox — Sharing Indicator"] no_focus
 for_window [app_id="gst-launch-1.0"] floating enable, resize set width 1920 px height 1080px
 assign [app_id="gst-launch-1.0"] 4
 assign [title="gst-play-1.0"] 4
+
+exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"
diff --git a/systemd/.config/systemd/user/sway-session.target b/systemd/.config/systemd/user/sway-session.target
new file mode 100644
index 0000000..a6dadf9
--- /dev/null
+++ b/systemd/.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
diff --git a/systemd/.config/systemd/user/tmux-session.service b/systemd/.config/systemd/user/tmux-session.service
new file mode 100644
index 0000000..9a5d252
--- /dev/null
+++ b/systemd/.config/systemd/user/tmux-session.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Start all tmux sessions on login
+
+[Service]
+Type=forking
+ExecStart=%h/.tmux/session-setup.sh
+
+[Install]
+WantedBy=sway-session.target