Add support for right cmd button