Enhancement: Empty states will now go away after the next click