diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 71949b9f3..8c91f609b 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -126,7 +126,7 @@ def choose_template(service_id, template_type='all', template_folder_id=None):
         current_template_folder_id=template_folder_id,
         can_manage_folders=can_manage_folders(),
         template_folder_path=current_service.get_template_folder_path(template_folder_id),
-        template_folders=current_service.get_template_folders(template_folder_id, template_type),
+        template_folders=current_service.get_template_folders(template_type, template_folder_id),
         templates=current_service.get_templates(template_type, template_folder_id),
         show_search_box=(len(current_service.get_templates(template_type)) > 7),
         show_template_nav=(
diff --git a/app/models/service.py b/app/models/service.py
index f60151b38..e4333ac2d 100644
--- a/app/models/service.py
+++ b/app/models/service.py
@@ -298,7 +298,7 @@ class Service():
     def all_template_folder_ids(self):
         return {folder['id'] for folder in self.all_template_folders}
 
-    def get_template_folders(self, parent_folder_id=None, template_type='all'):
+    def get_template_folders(self, template_type='all', parent_folder_id=None):
         return [
             folder for folder in self.all_template_folders
             if (
@@ -317,7 +317,7 @@ class Service():
 
         if any(
             self.show_folder(child_folder['id'], template_type)
-            for child_folder in self.get_template_folders(template_folder_id, template_type)
+            for child_folder in self.get_template_folders(template_type, template_folder_id)
         ):
             return True
 
@@ -341,7 +341,7 @@ class Service():
     def get_template_folders_and_templates(self, template_type, template_folder_id):
         return (
             self.get_templates(template_type, template_folder_id) +
-            self.get_template_folders(template_folder_id, template_type)
+            self.get_template_folders(template_type, template_folder_id)
         )
 
     def move_to_folder(self, ids_to_move, move_to):
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index ca4b7c57a..d92627d76 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -18,7 +18,7 @@
       </h2>
       <p class="message-type">
         {{ folder_contents_count(
-          current_service.get_template_folders(template_folder.id, template_type)|length,
+          current_service.get_template_folders(template_type, template_folder.id)|length,
           current_service.get_templates(template_type, template_folder.id)|length,
         ) }}
       </p>