diff --git a/src/main/java/de/metas/ui/web/picking/husToPick/HUsToPickViewFactory.java b/src/main/java/de/metas/ui/web/picking/husToPick/HUsToPickViewFactory.java
index 7c77d76ec..16f8a36db 100644
--- a/src/main/java/de/metas/ui/web/picking/husToPick/HUsToPickViewFactory.java
+++ b/src/main/java/de/metas/ui/web/picking/husToPick/HUsToPickViewFactory.java
@@ -11,6 +11,7 @@
 import de.metas.ui.web.view.json.JSONViewDataType;
 import de.metas.ui.web.window.datatypes.WindowId;
 import de.metas.ui.web.window.descriptor.factory.standard.LayoutFactory;
+import de.metas.ui.web.window.model.DocumentQueryOrderBy;
 
 /*
  * #%L
@@ -84,10 +85,9 @@ protected void customizeHUEditorViewRepository(final SqlHUEditorViewRepositoryBu
 	@Override
 	protected void customizeHUEditorView(HUEditorViewBuilder huViewBuilder)
 	{
-		// TODO: check if this is working...
-		// huViewBuilder
-		// .clearOrderBys()
-		// .orderBy(DocumentQueryOrderBy.byFieldName(HUEditorRow.FIELDNAME_BestBeforeDate))
-		// .orderBy(DocumentQueryOrderBy.byFieldName(HUEditorRow.FIELDNAME_M_HU_ID));
+		huViewBuilder
+				.clearOrderBys()
+				.orderBy(DocumentQueryOrderBy.builder().fieldName(HUEditorRow.FIELDNAME_BestBeforeDate).ascending(true).nullsLast(true).build())
+				.orderBy(DocumentQueryOrderBy.byFieldName(HUEditorRow.FIELDNAME_M_HU_ID));
 	}
 }