[3.2] Display issue between 3.1 and 3.2

One more possible solution (I did not test it myself):