Fix another current item menu issue