Fix menu item tooltips showing up too early (#13914)

Change-Id: Id324ed06e45e73a9383667e86651ea794c3ff322