The toolbar now shows the correct selection after version control or settings have been dismissed.