Enhance the right click