Closing shortcuts issue