Fix in Menu overflow buttton not persist afer we leave the selection screen

Change-Id: Ibf45d3bc4870c99ef8c71d7613b97a8af69adec5