Improve CommandServer click event