Buttons submenu FC fix

Change-Id: Ib128f56affaeeb59fabfdd653fa9e5b95f838f49