Navigation toolbar toggle fix