diff --git a/app/controllers/public_pages_controller.rb b/app/controllers/public_pages_controller.rb
index 90075ba..393c3c2 100644
--- a/app/controllers/public_pages_controller.rb
+++ b/app/controllers/public_pages_controller.rb
@@ -6,15 +6,7 @@
   def template_index
     templates = Template.live(Template.families(Org.all.pluck(:id)).pluck(:family_id)).pluck(:id) <<
     Template.where(is_default: true).unarchived.published.pluck(:id)
-    @templates = Template.includes(:org).where(id: templates.uniq.flatten).unarchived.published.order(title: :asc).page(1)
-
-
-    #funder_templates = Template.live(Template.families(Org.funder.pluck(:id)).pluck(:family_id)).publicly_visible.pluck(:id) 
-    #@funder_templates = Template.includes(:org).where(id: funder_templates.uniq.flatten).unarchived.published.order(title: :asc).page(1)
-
-   # org_templates = Template.live(Template.families(Org.institution.pluck(:id)).pluck(:family_id)).pluck(:id) <<
-    #Template.where(is_default: true).unarchived.published.pluck(:id)
-    #@org_templates = Template.includes(:org).where(id: org_templates.uniq.flatten).unarchived.published.order(title: :asc).page(1)
+    @templates = Template.includes(:org).where(id: templates.uniq.flatten).unarchived.published.order("orgs.name asc").page(1)
   end
 
   # GET template_export/:id
diff --git a/app/views/public_pages/template_index.html.erb b/app/views/public_pages/template_index.html.erb
index 6ee943f..c2507e0 100644
--- a/app/views/public_pages/template_index.html.erb
+++ b/app/views/public_pages/template_index.html.erb
@@ -15,7 +15,8 @@
         partial: '/paginable/templates/publicly_visible',
         controller: 'paginable/templates',
         action: 'publicly_visible', 
-        scope: @templates) %>
+        scope: @templates,
+        query_params: { sort_field: 'orgs.name', sort_direction: 'asc' }) %>
     <% end %>
   </div>
 </div>
\ No newline at end of file