Fix shortcuts behaviours