Clicking on a drop down no longer closes drop down if it is open after context menu change

Clicking on a drop down no longer closes drop down if it is open after context menu change. It disappears then quickly reappears. Also affects keyboard navigation as second press of enter no longer closes the item.

Repro:

1. Create a project
2. Select an item in the hierarchy.
3. In the inspector view, click on a drop down.
4. While it is open, click on it again.

Result: The drop down should close on the second click

Actual: Drop down quickly closes then reappears