diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 399fc3e..188062b 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -13,6 +13,7 @@ bspc config initial_polarity second_child
 
 bspc monitor -d 1 2 3 4 5 6 7 8 9 10
 
-xss-lock -- i3lock -e -i ~/images/lockscreen.png &
+pulseaudio --check || pulseaudio
+ps -u jdkaplan | grep -o xss-lock || xss-lock -- i3lock -e -i ~/images/lockscreen.png &
 nitrogen --restore &
-$PANEL_CONFIG_DIR/panel &
+ps -u jdkaplan | grep -o panel && pkill panel; $PANEL_CONFIG_DIR/panel &