Improve wait cursor handling in Sashimi