Address GH-71 by yielding in mid right_click