Update toolbar selection in dockzone calculation

Fixes #3804