Revert "Fixed not setting new index when switching toolbar"
Contains changes that should not have been committed yet.

This reverts commit bba813a1154d08f35a45e945fd35d735af483b39.
Fixed not setting new index when switching toolbars.