Fix bugs in bubbles with focus trick