diff --git a/dotfiles/systemd/i3.service b/dotfiles/systemd/i3.service
index 3626b36..0610bf1 100644
--- a/dotfiles/systemd/i3.service
+++ b/dotfiles/systemd/i3.service
@@ -2,6 +2,7 @@
 Description=i3 window manager
 PartOf=graphical-session.target
 After=xsession.target
+Wants=xsession.target
 
 [Service]
 ExecStart=/usr/bin/i3
diff --git a/dotfiles/systemd/xsession.target b/dotfiles/systemd/xsession.target
index 8e694fb..18986b1 100644
--- a/dotfiles/systemd/xsession.target
+++ b/dotfiles/systemd/xsession.target
@@ -4,7 +4,6 @@ BindsTo=graphical-session.target
 Wants=autorandr.service
 Wants=dunst.socket
 Wants=easyeffects.service
-Wants=i3.service
 Wants=inputplug.service
 Wants=picom.service
 Wants=policykit-agent.service
diff --git a/dotfiles/xsession b/dotfiles/xsession
index 6b79c73..ae15277 100644
--- a/dotfiles/xsession
+++ b/dotfiles/xsession
@@ -38,4 +38,4 @@ dconf load / < ~/.config/i3/dotfiles/dconf.ini
 # Services are started with systemd
 systemctl --user import-environment
 systemctl --user daemon-reload
-exec systemctl --user start --wait xsession.target
+exec systemctl --user start --wait i3.service