Keep select context after action (closes #1469)