diff --git a/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx b/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
index 28ccf99821..9f1721b2d0 100644
--- a/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
+++ b/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
@@ -188,7 +188,8 @@ const PolicyForm = ({
   const hasSavePermissions =
     !isEditMode || // save a new policy
     isGlobalAdmin ||
-    isGlobalMaintainer;
+    isGlobalMaintainer ||
+    isTeamMaintainerOrTeamAdmin;
 
   const onLoad = (editor: IAceEditor) => {
     editor.setOptions({
diff --git a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
index 56bc40a62b..dd4ed9ba99 100644
--- a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
@@ -77,6 +77,7 @@ const ManageQueriesPage = ({
   const queryParams = location.query;
   const {
     isGlobalAdmin,
+    isGlobalMaintainer,
     isTeamAdmin,
     isTeamMaintainer,
     isOnlyObserver,
@@ -361,9 +362,12 @@ const ManageQueriesPage = ({
   };
 
   // CTA button shows for all roles but global observers and current team's observers
-  const canCustomQuery = isOnGlobalTeam
-    ? !isOnlyObserver
-    : isTeamAdmin || isTeamMaintainer || isObserverPlus; // isObserverPlus checks specific team as well
+  const canCustomQuery =
+    isGlobalAdmin ||
+    isGlobalMaintainer ||
+    isTeamAdmin ||
+    isTeamMaintainer ||
+    isObserverPlus; // isObserverPlus checks global and selected team
 
   return (
     <MainContent className={baseClass}>