diff --git a/HISTORY.rst b/HISTORY.rst
index 5bff66f757..34ccfd6e63 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -271,6 +271,8 @@
 * Add the checkdependencies command.
 * Add comment and make file target to generate all requirement
   files.
+* Place deletion policies units before periods for clarity.
+
 
 3.1.11 (2019-04-XX)
 ===================
diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst
index 2d9c6be860..14df89eae7 100644
--- a/docs/releases/3.2.rst
+++ b/docs/releases/3.2.rst
@@ -705,6 +705,7 @@ Other changes
   Change color scheme to match rest of project. Increase size of data points.
   Improve responsive settings. Redirect to the current view after queueing.
 - Split document type retention policies into it own view.
+- Place deletion policies units before periods for clarity.
 
 
 Removals
diff --git a/mayan/apps/documents/views/document_type_views.py b/mayan/apps/documents/views/document_type_views.py
index 228443348c..6912751507 100644
--- a/mayan/apps/documents/views/document_type_views.py
+++ b/mayan/apps/documents/views/document_type_views.py
@@ -111,8 +111,8 @@ class DocumentTypeDeleteView(SingleObjectDeleteView):
 
 class DocumentTypeDeletionPoliciesEditView(SingleObjectEditView):
     fields = (
-        'trash_time_period', 'trash_time_unit', 'delete_time_period',
-        'delete_time_unit'
+        'trash_time_unit', 'trash_time_period', 'delete_time_unit',
+        'delete_time_period'
     )
     model = DocumentType
     object_permission = permission_document_type_edit