diff --git a/.config/i3/layers/config.post-main-00-security b/.config/i3/layers/config.post-main-00-security
index d52260f..1e0fde2 100644
--- a/.config/i3/layers/config.post-main-00-security
+++ b/.config/i3/layers/config.post-main-00-security
@@ -2,4 +2,7 @@
 exec_always --no-startup-id xss-lock --transfer-sleep-lock -- i3exit lock
 
 # lock screen after inactivity
-exec --no-startup-id xautolock -time $lock_after_min -locker 'i3exit lock' -notify $lock_notify_sec -notifier 'notify-send --icon=gtk-info xautolock "The screen will lock soon"'
+exec --no-startup-id xautolock -time $lock_after_min -locker 'loginctl lock-session' -notify $lock_notify_sec -notifier 'notify-send --icon=gtk-info xautolock "The screen will lock soon"'
+
+# Run i3hwlock
+exec_always --no-startup-id pgrep i3hwlock || i3hwlock
diff --git a/.installer/packages b/.installer/packages
index f24e027..41c8962 100644
--- a/.installer/packages
+++ b/.installer/packages
@@ -1,4 +1,4 @@
-pacman-any:feh,i3exit,i3status,network-manager-applet,pasystray,xautolock,xss-lock,noto-fonts-emoji
+pacman-any:feh,i3exit,i3status,network-manager-applet,pasystray,xautolock,inotify-tools,xss-lock,noto-fonts-emoji
 pacman-any:gst-libav,phonon-qt5-gstreamer,gst-plugins-good,qt5-quickcontrols,qt5-graphicaleffects,qt5-multimedia
 pacman-any:code,vim
 pacman-laptop:brightnessctl