Better handling of check for topbar