Add Keep current state option to Manage tab.