Fix #1602
Merge pull request #1603 from ThatOtherPerson/dismiss-popovers

Fix #1602