Fix shortcut viewer bug