Fix disappear-on-click bug again