Mode change back to whatever mode manager would do? (Take II)

Like this: