diff --git a/mayan/apps/document_states/classes.py b/mayan/apps/document_states/classes.py
index cdf1cb37e1..f86a8100c2 100644
--- a/mayan/apps/document_states/classes.py
+++ b/mayan/apps/document_states/classes.py
@@ -50,7 +50,11 @@ class WorkflowAction(six.with_metaclass(WorkflowActionMetaclass, WorkflowActionB
 
     @classmethod
     def get_all(cls):
-        return cls._registry
+        return sorted(cls._registry.values(), key=lambda x: x.label)
+
+    @classmethod
+    def id(cls):
+        return '{}.{}'.format(cls.__module__, cls.__name__)
 
     @staticmethod
     def initialize():
diff --git a/mayan/apps/document_states/forms.py b/mayan/apps/document_states/forms.py
index 84d23d4559..47ae7d6747 100644
--- a/mayan/apps/document_states/forms.py
+++ b/mayan/apps/document_states/forms.py
@@ -24,8 +24,8 @@ class WorkflowActionSelectionForm(forms.Form):
 
         self.fields['klass'].choices = [
             (
-                key, klass.label
-            ) for key, klass in WorkflowAction.get_all().items()
+                klass.id(), klass.label
+            ) for klass in WorkflowAction.get_all()
         ]