diff --git a/app/docker/react/components/index.ts b/app/docker/react/components/index.ts
index c0627cf82..56558bd4f 100644
--- a/app/docker/react/components/index.ts
+++ b/app/docker/react/components/index.ts
@@ -3,6 +3,8 @@ import angular from 'angular';
 import { r2a } from '@/react-tools/react2angular';
 import { ContainersDatatableContainer } from '@/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableContainer';
 import { ContainerQuickActions } from '@/react/docker/containers/components/ContainerQuickActions';
+import { TemplateListDropdownAngular } from '@/react/docker/app-templates/TemplateListDropdown';
+import { TemplateListSortAngular } from '@/react/docker/app-templates/TemplateListSort';
 
 export const componentsModule = angular
   .module('portainer.docker.react.components', [])
@@ -26,4 +28,6 @@ export const componentsModule = angular
       'status',
       'taskId',
     ])
-  ).name;
+  )
+  .component('templateListDropdown', TemplateListDropdownAngular)
+  .component('templateListSort', TemplateListSortAngular).name;
diff --git a/app/portainer/components/template-list/template-list-controller.js b/app/portainer/components/template-list/template-list-controller.js
index 23554347f..7185250b3 100644
--- a/app/portainer/components/template-list/template-list-controller.js
+++ b/app/portainer/components/template-list/template-list-controller.js
@@ -2,48 +2,53 @@ import _ from 'lodash-es';
 
 angular.module('portainer.app').controller('TemplateListController', TemplateListController);
 
-function TemplateListController($async, $state, DatatableService, Notifications, TemplateService) {
+function TemplateListController($scope, $async, $state, DatatableService, Notifications, TemplateService) {
   var ctrl = this;
 
   this.state = {
     textFilter: '',
-    selectedCategory: '',
+    selectedCategory: null,
     categories: [],
+    typeFilters: [],
+    filterByType: null,
     showContainerTemplates: true,
+    selectedOrderBy: null,
+    orderByFields: [],
+    orderDesc: false,
   };
 
   this.onTextFilterChange = function () {
     DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter);
   };
 
-  this.filterByTemplateType = function (item) {
+  ctrl.filterByTemplateType = function (item) {
     switch (item.Type) {
       case 1: // container
         return ctrl.state.showContainerTemplates;
       case 2: // swarm stack
-        return ctrl.showSwarmStacks;
+        return ctrl.showSwarmStacks && !ctrl.state.showContainerTemplates;
       case 3: // docker compose
-        return !ctrl.showSwarmStacks || (ctrl.showSwarmStacks && ctrl.state.showContainerTemplates);
+        return !ctrl.state.showContainerTemplates || null === ctrl.state.filterByType;
       case 4: // Edge stack templates
         return false;
     }
     return false;
   };
 
-  this.updateCategories = function () {
+  ctrl.updateCategories = function () {
     var availableCategories = [];
 
     for (var i = 0; i < ctrl.templates.length; i++) {
       var template = ctrl.templates[i];
-      if (this.filterByTemplateType(template)) {
+      if (ctrl.filterByTemplateType(template)) {
         availableCategories = availableCategories.concat(template.Categories);
       }
     }
 
-    this.state.categories = _.sortBy(_.uniq(availableCategories));
+    ctrl.state.categories = _.sortBy(_.uniq(availableCategories));
   };
 
-  this.filterByCategory = function (item) {
+  ctrl.filterByCategory = function (item) {
     if (!ctrl.state.selectedCategory) {
       return true;
     }
@@ -73,6 +78,40 @@ function TemplateListController($async, $state, DatatableService, Notifications,
     }
   }
 
+  ctrl.changeOrderBy = function (orderField) {
+    $scope.$evalAsync(() => {
+      if (null === orderField) {
+        ctrl.state.selectedOrderBy = null;
+        ctrl.templates = ctrl.initalTemplates;
+      }
+
+      ctrl.state.selectedOrderBy = orderField;
+      ctrl.templates = _.orderBy(ctrl.templates, [getSorter(ctrl.state.selectedOrderBy)], [ctrl.state.orderDesc ? 'desc' : 'asc']);
+    });
+  };
+
+  ctrl.applyTypeFilter = function (type) {
+    $scope.$evalAsync(() => {
+      ctrl.state.filterByType = type;
+      ctrl.state.showContainerTemplates = 'Container' === type || null === type;
+      ctrl.updateCategories();
+    });
+  };
+
+  ctrl.invertOrder = function () {
+    $scope.$evalAsync(() => {
+      ctrl.state.orderDesc = !ctrl.state.orderDesc;
+      ctrl.templates = _.orderBy(ctrl.templates, [getSorter(ctrl.state.selectedOrderBy)], [ctrl.state.orderDesc ? 'desc' : 'asc']);
+    });
+  };
+
+  ctrl.applyCategoriesFilter = function (category) {
+    $scope.$evalAsync(() => {
+      ctrl.state.selectedCategory = category;
+      ctrl.updateCategories();
+    });
+  };
+
   this.$onInit = function () {
     if (this.showSwarmStacks) {
       this.state.showContainerTemplates = false;
@@ -83,5 +122,28 @@ function TemplateListController($async, $state, DatatableService, Notifications,
     if (textFilter !== null) {
       this.state.textFilter = textFilter;
     }
+
+    this.initalTemplates = this.templates;
+    this.state.orderByFields = ['Title', 'Categories', 'Description'];
+    this.state.typeFilters = ['Container', 'Stack'];
   };
+
+  function categorySorter(template) {
+    if (template.Categories && template.Categories.length > 0 && template.Categories[0] && template.Categories[0].length > 0) {
+      return template.Categories[0].toLowerCase();
+    }
+  }
+
+  function getSorter(orderBy) {
+    let sorter;
+    switch (orderBy) {
+      case 'Categories':
+        sorter = categorySorter;
+        break;
+      default:
+        sorter = orderBy;
+    }
+
+    return sorter;
+  }
 }
diff --git a/app/portainer/components/template-list/templateList.html b/app/portainer/components/template-list/templateList.html
index 222b24f72..1ad09e43c 100644
--- a/app/portainer/components/template-list/templateList.html
+++ b/app/portainer/components/template-list/templateList.html
@@ -2,45 +2,45 @@
   <rd-widget>
     <rd-widget-header icon="{{ $ctrl.titleIcon }}" feather-icon="true" title-text="{{ $ctrl.titleText }}"></rd-widget-header>
     <rd-widget-body classes="no-padding">
-      <div class="mx-3">
-        <div class="actionBar">
-          <div>
+      <div class="actionBar">
+        <div class="row">
+          <div class="col-sm-12">
             <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.templates.new" ng-if="$ctrl.showAddAction">
               <i class="fa fa-plus space-right" aria-hidden="true"></i>Add template
             </button>
-            <span ng-class="{ 'pull-right': $ctrl.showAddAction }">
-              <ui-select ng-model="$ctrl.state.selectedCategory">
-                <ui-select-match placeholder="Select a category" allow-clear="true">
-                  <span>{{ $select.selected }}</span>
-                </ui-select-match>
-                <ui-select-choices repeat="category in ($ctrl.state.categories | filter: $select.search)">
-                  <span>{{ category }}</span>
-                </ui-select-choices>
-              </ui-select>
-            </span>
-          </div>
-
-          <div class="small text-muted mt-3">
-            <label for="show_stacks" class="control-label text-left"> Show container templates </label>
-            <label class="switch space-left">
-              <input type="checkbox" name="show_stacks" ng-model="$ctrl.state.showContainerTemplates" ng-change="$ctrl.updateCategories()" /><i></i>
-            </label>
           </div>
         </div>
-
-        <div class="searchBar">
-          <i class="fa fa-search searchIcon" aria-hidden="true"></i>
-          <input
-            type="text"
-            class="searchInput"
-            ng-model="$ctrl.state.textFilter"
-            ng-change="$ctrl.onTextFilterChange()"
-            placeholder="Search..."
-            auto-focus
-            ng-model-options="{ debounce: 300 }"
-          />
+        <div class="row">
+          <div class="col-sm-3">
+            <template-list-dropdown
+              options="$ctrl.state.categories"
+              on-change="($ctrl.applyCategoriesFilter)"
+              placeholder="'Category'"
+              value="$ctrl.state.selectedCategory"
+            ></template-list-dropdown>
+          </div>
+          <div class="col-sm-3">
+            <template-list-dropdown
+              options="$ctrl.state.typeFilters"
+              on-change="($ctrl.applyTypeFilter)"
+              placeholder="'Type'"
+              value="$ctrl.state.filterByType"
+            ></template-list-dropdown>
+          </div>
+          <div class="col-sm-3 col-sm-offset-3">
+            <template-list-sort
+              on-change="($ctrl.changeOrderBy)"
+              on-descending="($ctrl.invertOrder)"
+              options="$ctrl.state.orderByFields"
+              sort-by-button="true"
+              sort-by-descending="$ctrl.state.orderDesc"
+              placeholder="'Sort By'"
+              value="$ctrl.state.selectedOrderBy"
+            ></template-list-sort>
+          </div>
         </div>
       </div>
+
       <div class="blocklist">
         <template-item
           ng-repeat="template in $ctrl.templates | filter: $ctrl.filterByTemplateType | filter:$ctrl.filterByCategory | filter:$ctrl.state.textFilter"
diff --git a/app/react/docker/app-templates/TemplateListDropdown/TemplateListDropdown.tsx b/app/react/docker/app-templates/TemplateListDropdown/TemplateListDropdown.tsx
new file mode 100644
index 000000000..c48fab24e
--- /dev/null
+++ b/app/react/docker/app-templates/TemplateListDropdown/TemplateListDropdown.tsx
@@ -0,0 +1,32 @@
+import { Select } from '@@/form-components/ReactSelect';
+
+interface Filter {
+  label?: string;
+}
+
+interface Props {
+  options: string[];
+  onChange: (value: string | null) => void;
+  placeholder?: string;
+  value: string;
+}
+
+export function TemplateListDropdown({
+  options,
+  onChange,
+  placeholder,
+  value,
+}: Props) {
+  const filterOptions: Filter[] = options.map((value) => ({ label: value }));
+  const filterValue: Filter | null = value ? { label: value } : null;
+
+  return (
+    <Select
+      placeholder={placeholder}
+      options={filterOptions}
+      value={filterValue}
+      isClearable
+      onChange={(option) => onChange(option?.label ?? null)}
+    />
+  );
+}
diff --git a/app/react/docker/app-templates/TemplateListDropdown/index.ts b/app/react/docker/app-templates/TemplateListDropdown/index.ts
new file mode 100644
index 000000000..ea066c563
--- /dev/null
+++ b/app/react/docker/app-templates/TemplateListDropdown/index.ts
@@ -0,0 +1,11 @@
+import { react2angular } from '@/react-tools/react2angular';
+
+import { TemplateListDropdown } from './TemplateListDropdown';
+
+const TemplateListDropdownAngular = react2angular(TemplateListDropdown, [
+  'options',
+  'onChange',
+  'placeholder',
+  'value',
+]);
+export { TemplateListDropdown, TemplateListDropdownAngular };
diff --git a/app/react/docker/app-templates/TemplateListSort/TemplateListSort.module.css b/app/react/docker/app-templates/TemplateListSort/TemplateListSort.module.css
new file mode 100644
index 000000000..3bd37f507
--- /dev/null
+++ b/app/react/docker/app-templates/TemplateListSort/TemplateListSort.module.css
@@ -0,0 +1,18 @@
+.sort-by-container {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.sort-by-element {
+  display: inline-block;
+}
+
+.sort-button {
+  background-color: var(--bg-sortbutton-color);
+  color: var(--text-ui-select-color);
+  border: 1px solid var(--border-sortbutton);
+  display: inline-block;
+  padding: 8px 10px;
+  border-radius: 5px;
+}
diff --git a/app/react/docker/app-templates/TemplateListSort/TemplateListSort.tsx b/app/react/docker/app-templates/TemplateListSort/TemplateListSort.tsx
new file mode 100644
index 000000000..e44065797
--- /dev/null
+++ b/app/react/docker/app-templates/TemplateListSort/TemplateListSort.tsx
@@ -0,0 +1,53 @@
+import { TemplateListDropdown } from '../TemplateListDropdown';
+
+import styles from './TemplateListSort.module.css';
+
+interface Props {
+  options: string[];
+  onChange: (value: string | null) => void;
+  onDescending: () => void;
+  placeholder?: string;
+  sortByDescending: boolean;
+  sortByButton: boolean;
+  value: string;
+}
+
+export function TemplateListSort({
+  options,
+  onChange,
+  onDescending,
+  placeholder,
+  sortByDescending,
+  sortByButton,
+  value,
+}: Props) {
+  const upIcon = 'fa fa-sort-alpha-up';
+  const downIcon = 'fa fa-sort-alpha-down';
+  const iconStyle = sortByDescending ? upIcon : downIcon;
+
+  return (
+    <div className={styles.sortByContainer}>
+      <div className={styles.sortByElement}>
+        <TemplateListDropdown
+          placeholder={placeholder}
+          options={options}
+          onChange={onChange}
+          value={value}
+        />
+      </div>
+      <div className={styles.sortByElement}>
+        <button
+          className={styles.sortButton}
+          type="button"
+          disabled={!sortByButton || !value}
+          onClick={(e) => {
+            e.preventDefault();
+            onDescending();
+          }}
+        >
+          <i className={iconStyle} />
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/app/react/docker/app-templates/TemplateListSort/index.ts b/app/react/docker/app-templates/TemplateListSort/index.ts
new file mode 100644
index 000000000..669a0ea45
--- /dev/null
+++ b/app/react/docker/app-templates/TemplateListSort/index.ts
@@ -0,0 +1,14 @@
+import { react2angular } from '@/react-tools/react2angular';
+
+import { TemplateListSort } from './TemplateListSort';
+
+const TemplateListSortAngular = react2angular(TemplateListSort, [
+  'options',
+  'onChange',
+  'onDescending',
+  'placeholder',
+  'sortByDescending',
+  'sortByButton',
+  'value',
+]);
+export { TemplateListSort, TemplateListSortAngular };