Retain the active component: refs #572