Close the secondary toolbar when an action is only performed once
Merge pull request #4140 from timvandermeij/close-secondary-toolbar

Close the secondary toolbar when an action is performed once