Resolves: fdo#79124 options cells shift down when unit clicked

Change-Id: I528da752a38fcfb25aae40476891eb5052cf93b7
(cherry picked from commit 66925f65f83910ce97b4213f91d0d0e3aa2db43e)