Fix Menu Overflow Toggle

Toggle didn't work before, overflow would always show. Original authors: BMc08GT & xLaMbChOpSx

Change-Id: I708ca65039dcf6aec673a729d159cedeeb56852d
(cherry picked from commit 2d1cf267dd2c7b9b58bc9d635d586119fc9e3e20)