diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index 2debc017..93352d88 100755
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -14,4 +14,4 @@ else
 	. "$HOME/.xprofile"
 fi
 
-ssh-agent dwm
+exec dbus-launch --exit-with-session dwm
diff --git a/.config/x11/xprofile b/.config/x11/xprofile
index d6b88c5e..b8ea4032 100755
--- a/.config/x11/xprofile
+++ b/.config/x11/xprofile
@@ -8,6 +8,7 @@ setbg &			# set the background with the `setbg` script
 #xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources & xrdbpid=$!	# Uncomment to use Xresources colors/settings on startup
 
 autostart="mpd xcompmgr dunst unclutter pipewire remapd"
+eval $(ssh-agent)
 
 for program in $autostart; do
 	pidof -sx "$program" || "$program" &