Fix unintended text field behaviour #2