Fixed return button behaviour