Fixing issue with ghost clicks on controls