Issue #8348 by tuj: Edit goes to step 4 instead of 5