diff --git a/editor.planx.uk/src/components/Header.tsx b/editor.planx.uk/src/components/Header.tsx
index ebc2b00313..79bc3e8d6c 100644
--- a/editor.planx.uk/src/components/Header.tsx
+++ b/editor.planx.uk/src/components/Header.tsx
@@ -480,7 +480,7 @@ const EditorToolbar: React.FC<{
                 <Edit />
               </ListItemIcon>
               <ListItemText>
-                {user.isPlatformAdmin ? `All teams` : user.teams.map((team) => team.team.name).join(", ")}
+                {user.isPlatformAdmin ? `All teams` : user.teams.map((team) => team.team.name).concat(["Templates"]).join(", ")}
               </ListItemText>
             </MenuItem>
           )}
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/editor.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/editor.ts
index f3c812a0ce..bd75ea0b84 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/store/editor.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/store/editor.ts
@@ -23,6 +23,7 @@ import { FlowLayout } from "../../components/Flow";
 import { connectToDB, getConnection } from "./../sharedb";
 import type { Store } from ".";
 import type { SharedStore } from "./shared";
+import { UserStore } from "./user";
 
 let doc: any;
 
@@ -82,7 +83,7 @@ export interface EditorStore extends Store.Store {
 }
 
 export const editorStore: StateCreator<
-  SharedStore & EditorStore,
+  SharedStore & EditorStore & UserStore,
   [],
   [],
   EditorStore
@@ -333,6 +334,12 @@ export const editorStore: StateCreator<
   },
 
   moveFlow(flowId: string, teamSlug: string) {
+    const valid = get().canUserEditTeam(teamSlug);
+    if (!valid) {
+      alert(`You do not have permission to move this flow into ${teamSlug}, try again`);
+      return Promise.resolve();
+    }
+
     const token = getCookie("jwt");
 
     return axios
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts
index 94afd1cbb1..d31cffd7ac 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts
@@ -47,11 +47,9 @@ export const userStore: StateCreator<UserStore, [], [], UserStore> = (
 
   canUserEditTeam: (teamSlug) => {
     return (
-      get().teams.filter(
-        (team) =>
-          (team.role === "teamEditor" && team.team.slug === teamSlug) ||
-          get().isPlatformAdmin,
-      ).length > 0
+      get().isPlatformAdmin ||
+      teamSlug === "templates" ||
+      get().teams.filter((team) => team.role === "teamEditor" && team.team.slug === teamSlug).length > 0
     );
   },
 });