[Core] Properly store current toolbar, probably fixes #1316.