Improved menu handling when clicked.