Fix removal of toolbar.