[BUGFIX] Keep selected page active after save & close