Implement temporary shorcut selection solution