Prevent unwanted menus from activating (FWNX-1353)

Change-Id: I78a5d239b500446147384d7b174f2325e381e9f2