Properly disabled commands in linger mode (bug #21450)