[3.8] Fix #1495 Remove focus when editing fields