Fix a clash between focused and hovered buttons

Border of a focused button shouldn't get hidden when the next button in the group is hovered.
![gofigure](https://cloud.githubusercontent.com/assets/94334/4176640/2e7e4674-360e-11e4-9b74-10a4c9b614d8.png)