diff --git a/.config/i3/config b/.config/i3/config
index 02394ac..af3761c 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -161,8 +161,8 @@ set $mode_cmd [c st] [F firefox] [H hibernate] [L suspend]
 mode "$mode_cmd" {
      bindsym c exec st -e /usr/bin/fish; mode "default"
      bindsym Shift+f exec "firefox"; mode "default"
-     bindsym --release Shift+h exec "slock systemctl hibernate"; mode "default"
-     bindsym --release Shift+l exec "slock systemctl suspend"; mode "default"
+     bindsym --release Shift+h exec "systemctl hibernate"; mode "default"
+     bindsym --release Shift+l exec "systemctl suspend"; mode "default"
      bindsym Escape mode "default"
      bindsym Ctrl+g mode "default"
 }
diff --git a/.config/stumpwm/config b/.config/stumpwm/config
index 0678ead..7fa28fe 100644
--- a/.config/stumpwm/config
+++ b/.config/stumpwm/config
@@ -17,8 +17,8 @@
 (define-key *root-map* (kbd "c") "exec st -e /usr/bin/fish")
 (define-key *root-map* (kbd "C-c") "exec st -e /usr/bin/fish")
 (define-key *root-map* (kbd "s-TAB") "gother")
-(define-key *root-map* (kbd "H") "exec slock systemctl hibernate")
-(define-key *root-map* (kbd "L") "exec slock systemctl suspend")
+(define-key *root-map* (kbd "H") "exec systemctl hibernate")
+(define-key *root-map* (kbd "L") "exec systemctl suspend")
 (define-key *root-map* (kbd "F") "exec firefox")
 
 (define-key *top-map* (kbd "s-1") "gselect 1")
diff --git a/.xsession b/.xsession
index a678491..fc4fcc7 100755
--- a/.xsession
+++ b/.xsession
@@ -10,6 +10,13 @@ xsetroot -solid '#424242'
 xrdb -merge ~/.Xresources
 setxkbmap pl -option ctrl:nocaps
 
+# lock screen on suspend/hibernate
+if which xss-lock slock >/dev/null; then
+    xss-lock slock &
+else
+    ( echo "Missing command(s):"; which xss-lock slock 2>&1 ) | xmessage -file -
+fi
+
 # run emacs daemon if not running
 emacsclient --eval nil -a '' &