diff --git a/.config/srandrd.conf b/.config/srandrd.conf
index 4a7e92b..729f924 100755
--- a/.config/srandrd.conf
+++ b/.config/srandrd.conf
@@ -3,8 +3,10 @@
 
 case "$SRANDRD_ACTION" in
 	"HDMI1 connected")	xrandr --output HDMI1 --auto
-				xrandr --output eDP1 --off;;
+				xrandr --output eDP1 --off
+				pacmd set-default-sink 0;;
 	"HDMI1 disconnected")	xrandr --output HDMI1 --off
-				xrandr --output eDP1 --auto;;
+				xrandr --output eDP1 --auto
+				pacmd set-default-sink 1;;
 esac
 
diff --git a/.xinitrc b/.xinitrc
index 203e4cf..9f1c02f 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -29,7 +29,7 @@ eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export SSH_AUTH_SOCK
 
 # Automatically lock after 30 minutes using slock
-xautolock -time 30 -locker i3lock -b -d -c 000000 -e -f
+xautolock -time 30 -locker 'i3lock -b -d -c 000000 -e -f' &
 
 # Thurstybook-specific config:
 [[ "$HOSTNAME" == "thurstybook" ]] && srandrd ~/.config/srandrd.conf