Improve for awesome wm behaviour