diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js
index 2e2215b5..634083ba 100644
--- a/pentadactyl/content/config.js
+++ b/pentadactyl/content/config.js
@@ -64,8 +64,7 @@ var Config = Module("config", ConfigBase, {
             },
 
             get toolbars() {
-                let navbar = window.document.getElementById("nav-bar");
-                return window.getTogglableToolbars().concat(navbar);
+                return Array.from(DOM.XPath("//*[@toolbarname]", window.document));
             },
 
             removeTab: function removeTab(tab) {