[forms] Attempt to fix current selection bug.