diff --git a/scripts/build.mjs b/scripts/build.mjs
index f485705..eaf5951 100644
--- a/scripts/build.mjs
+++ b/scripts/build.mjs
@@ -200,7 +200,7 @@ export const esbuildOptions = {
     `addon/chrome/content/scripts/${config.addonRef}.js`,
   ),
   // Don't turn minify on
-  minify: env.NODE_ENV === "production",
+  minify: false,
 };
 
 export async function main() {
diff --git a/src/modules/workspace/content.ts b/src/modules/workspace/content.ts
index 7d1a3d9..52636f2 100644
--- a/src/modules/workspace/content.ts
+++ b/src/modules/workspace/content.ts
@@ -1,3 +1,5 @@
+import { waitUtilAsync } from "../../utils/wait";
+
 export async function initWorkspace(container: XUL.Box, item: Zotero.Item) {
   if (!container) {
     return;
@@ -10,6 +12,8 @@ export async function initWorkspace(container: XUL.Box, item: Zotero.Item) {
   const customElements = container.ownerGlobal
     .customElements as CustomElementRegistry;
 
+  await waitUtilAsync(() => !!customElements.get("bn-workspace"));
+
   const workspace = new (customElements.get("bn-workspace")!)() as any;
   container.append(workspace);
   workspace.item = item;