Makes it consistent with other tool buttons and overflow menus and enables the user to press + move to desired option + release (cherry picked from commit a7654824)
