diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index 0e1dfcebd8..bd2da603ad 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -2,6 +2,7 @@
 
 module OrgAdmin
   # Controller that handles templates
+  # rubocop:disable Metrics/ClassLength
   class TemplatesController < ApplicationController
     include Paginable
     include Versionable
@@ -157,6 +158,10 @@ def edit
     def new
       authorize Template
       @template = current_org.templates.new
+      # If the Org is a funder set the visibility to Public otherwise set to Organizational
+      # for Orgs that are both, the admin will see controls on the page to let them choose.
+      # The default is already 'organisationally_visible' so change it if this is a funder
+      @template.visibility = Template.visibilities[:publicly_visible] if current_org.funder?
     end
 
     # POST /org_admin/templates
@@ -410,4 +415,5 @@ def get_referrer(template, referrer)
       end
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end
diff --git a/app/views/org_admin/templates/_form.html.erb b/app/views/org_admin/templates/_form.html.erb
index 0a6ec2db62..abf6569b17 100644
--- a/app/views/org_admin/templates/_form.html.erb
+++ b/app/views/org_admin/templates/_form.html.erb
@@ -29,7 +29,7 @@
 <% else %>
   <%
   visibility = f.object.visibility
-  visibility = f.object.funder? ? 'publicly_visible' : 'organisationally_visible' if visibility.nil?
+  visibility = f.object.org.funder? ? 'publicly_visible' : 'organisationally_visible' if visibility.nil?
   %>
   <%= f.hidden_field :visibility, value: visibility %>
 <% end %>