Make sure notifications are always visible.

fix #549
Merge branch '1.1.x'