Moved the disable right click to the event handler section