Fixing bug 4982

Now, "Back" button is always correct...