Fix context menus not clicking sometimes.

Ready for release