Improve lockscreen behavior