Fixed support for the new shift-exit feature of 1.6.1

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>