Eliminate a couple of cases where caret nav gets stuck in browse mode