diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index b7be26e0685..e833dd6751b 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3530,9 +3530,7 @@ function BrowserToolboxCustomizeDone(aToolboxChanged) {
     SetClickAndHoldHandlers();
 #endif
 
-  // XXX Shouldn't have to do this, but I do
-  if (!gCustomizeSheet)
-    window.focus();
+  window.content.focus();
 }
 
 function BrowserToolboxCustomizeChange() {