diff --git a/addon/chrome/content/overlay.xul b/addon/chrome/content/overlay.xul
index 005faca..b8f3777 100644
--- a/addon/chrome/content/overlay.xul
+++ b/addon/chrome/content/overlay.xul
@@ -57,13 +57,13 @@
     <menupopup id="menu_EditPopup">
         <menuseparator class="menu-type-betternotes" />
         <menu id="menu_insertTextTemplate_betternotes" class="menu-type-betternotes" label="&zotero.__addonRef__.workspace.menu.insertTextTemplate;">
-            <menupopup id="menu_insertTextTemplatePopup_betternotes" onpopupshowing="Zotero.Knowledge4Zotero.views.updateTemplateMenu('Text');" />
+            <menupopup id="menu_insertTextTemplatePopup" onpopupshowing="Zotero.Knowledge4Zotero.views.updateTemplateMenu('Text', 'tab');" />
         </menu>
         <menu id="menu_insertNoteTemplate_betternotes" class="menu-type-betternotes" label="&zotero.__addonRef__.workspace.menu.insertNoteTemplate;">
-            <menupopup id="menu_insertNoteTemplatePopup_betternotes" onpopupshowing="Zotero.Knowledge4Zotero.views.updateTemplateMenu('Note');" />
+            <menupopup id="menu_insertNoteTemplatePopup" onpopupshowing="Zotero.Knowledge4Zotero.views.updateTemplateMenu('Note', 'tab');" />
         </menu>
         <menu id="menu_insertItemTemplate_betternotes" class="menu-type-betternotes" label="&zotero.__addonRef__.workspace.menu.insertItemTemplate;">
-            <menupopup id="menu_insertItemTemplatePopup_betternotes" onpopupshowing="Zotero.Knowledge4Zotero.views.updateTemplateMenu('Item');" />
+            <menupopup id="menu_insertItemTemplatePopup" onpopupshowing="Zotero.Knowledge4Zotero.views.updateTemplateMenu('Item', 'tab');" />
         </menu>
         <menuitem id="menu_editTemplate_betternotes" class="menu-type-betternotes" label="&zotero.__addonRef__.workspace.menu.editTemplate;" command="cmd_editTemplate_betternotes" />
         <menuseparator class="menu-type-betternotes" />
diff --git a/src/views.ts b/src/views.ts
index 375b154..66b1dcb 100644
--- a/src/views.ts
+++ b/src/views.ts
@@ -756,8 +756,12 @@ class AddonViews extends AddonBase {
     }
   }
 
-  updateTemplateMenu(type: "Note" | "Item" | "Text") {
-    const _window = this._Addon.knowledge.getWorkspaceWindow();
+  updateTemplateMenu(
+    type: "Note" | "Item" | "Text",
+    from: "tab" | "window" = "window"
+  ) {
+    const _window =
+      from === "window" ? this._Addon.knowledge.getWorkspaceWindow() : window;
     Zotero.debug(`updateTemplateMenu, ${this.currentOutline}`);
     let templates = this._Addon.template
       .getTemplateKeys()