diff --git a/.config/i3/config b/.config/i3/config
index 9bc28da..b904bc5 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -182,7 +182,7 @@ exec --no-startup-id "ip monitor | while read line; do pkill -RTMIN+15 i3blocks;
 # app launch shortcuts
 exec --no-startup-id ~/.fehbg
 exec --no-startup-id ~/.config/i3/disable-standby-fs.py
-exec --no-startup-id xautolock -time 5 -locker ~/.config/i3/lock.sh
+exec --no-startup-id xautolock -time 5 -locker ~/.config/i3/lock.sh -nocloseout -nocloseerr
 
 # startup programs
 exec --no-startup-id pulseaudio
diff --git a/.config/i3/disable-standby-fs.py b/.config/i3/disable-standby-fs.py
old mode 100644
new mode 100755
index b8ca13f..13b2288
--- a/.config/i3/disable-standby-fs.py
+++ b/.config/i3/disable-standby-fs.py
@@ -16,16 +16,16 @@ args = parser.parse_args()
 
 def on_fullscreen_mode(i3, e):
     if e.container.props.fullscreen_mode:
-        call(['xset', 's', 'off'])
-        call(['xset', '-dpms'])
+        call(['xautolock', '-disable'])
+        print("disabling autolock")
     else:
-        call(['xset', 's', 'on'])
-        call(['xset', '+dpms'])
+        call(['xautolock', '-enable'])
+        print("enabling autolock")
 
 def on_window_close(i3, e):
     if e.container.props.fullscreen_mode:
-        call(['xset', 's', 'on'])
-        call(['xset', '+dpms'])
+        call(['xautolock', '-enable'])
+        print("enabling autolock")
 
 i3.on('window::fullscreen_mode', on_fullscreen_mode)
 i3.on('window::close', on_window_close)