diff --git a/scheduletemplates/managers.py b/scheduletemplates/managers.py
index 661bce02..7b0bf9fb 100644
--- a/scheduletemplates/managers.py
+++ b/scheduletemplates/managers.py
@@ -1,5 +1,6 @@
 # coding: utf-8
 from django.db import models
+from django.db.models import F
 
 
 class ShiftTemplateManager(models.Manager):
@@ -16,8 +17,8 @@ def get_queryset(self):
 
         qs = qs.order_by(
             "schedule_template",
-            "task",
-            "workplace",
+            F("task__priority").desc(nulls_last=True),
+            F("workplace__priority").desc(nulls_last=True),
             "starting_time",
             "-days",
             "-ending_time",