Yea this behaviour is the current behaviour of the InfoBubble. Unless there is a change in design, we should be keeping it this way :) 
I'll submit another commit to this pull request to break this 'if' into two.