improved activation behaviour, make it work with keyboard now