enable short-cuts after introducing search view
Improve shortcuts