oops: Fix external toolbar z-index issue

Fixes #980