Bug fix

Edge case when navigating via UP key