#505 [Hugo, Remo] Cancel button will now always go back