add back finish() calls on navigateUp