The fix was on my desk the whole time.
One button now lets me disconnect whenever I want.