hopefully this gets the right click behavior right
scripted update of code from master at 96e73a4 hopefully this gets the right click behavior right