Correct the behavion of toolbar