diff --git a/Tools/scripts/build_options.py b/Tools/scripts/build_options.py
index 7b838769ff..124386e9f1 100644
--- a/Tools/scripts/build_options.py
+++ b/Tools/scripts/build_options.py
@@ -226,4 +226,4 @@ BUILD_OPTIONS = [
     Feature('Payload', 'Camera', 'AP_CAMERA_ENABLED', 'Enable Camera Trigger support', 0, None),
 ]
 
-BUILD_OPTIONS.sort(key=lambda x: x.category)
+BUILD_OPTIONS.sort(key=lambda x: (x.category + x.label))