Make "Quit after copy" feature work

BUG: 393708
This was included in a new feature that wasn't appriate for the stable
branch, but this part of it is a bugfix that should be in the 19.04
release