diff --git a/app/actions/definitions/documents.tsx b/app/actions/definitions/documents.tsx
index 193a13645..df74c6de4 100644
--- a/app/actions/definitions/documents.tsx
+++ b/app/actions/definitions/documents.tsx
@@ -96,8 +96,8 @@ export const createDocumentFromTemplate = createAction({
   visible: ({ currentTeamId, activeDocumentId, stores }) =>
     !!currentTeamId &&
     !!activeDocumentId &&
-    stores.policies.abilities(currentTeamId).createDocument &&
-    !stores.documents.get(activeDocumentId)?.template,
+    !!stores.documents.get(activeDocumentId)?.template &&
+    stores.policies.abilities(currentTeamId).createDocument,
   perform: ({ activeCollectionId, activeDocumentId, inStarredSection }) =>
     history.push(
       newDocumentPath(activeCollectionId, { templateId: activeDocumentId }),
diff --git a/app/components/Sidebar/App.tsx b/app/components/Sidebar/App.tsx
index 00c8949d4..6feb4fef8 100644
--- a/app/components/Sidebar/App.tsx
+++ b/app/components/Sidebar/App.tsx
@@ -41,6 +41,9 @@ function AppSidebar() {
   React.useEffect(() => {
     if (!user.isViewer) {
       void documents.fetchDrafts();
+
+      // TODO: Move this out of sidebar
+      void documents.fetchTemplates();
     }
   }, [documents, user.isViewer]);