Revert "Issue #3231321 by bnjmnm, nod_, lauriii: Improve keyboard accessibility in a particular edge case" This reverts commit bd709581.