Fix: Simplify TopBar hook

refs #5597