diff --git a/src/objects/zcl_abapgit_object_wdyn.clas.abap b/src/objects/zcl_abapgit_object_wdyn.clas.abap
index 2c642fa55..42d3ace7c 100644
--- a/src/objects/zcl_abapgit_object_wdyn.clas.abap
+++ b/src/objects/zcl_abapgit_object_wdyn.clas.abap
@@ -360,6 +360,7 @@ CLASS ZCL_ABAPGIT_OBJECT_WDYN IMPLEMENTATION.
 
     FIELD-SYMBOLS: <ls_object>               LIKE LINE OF lt_objects,
                    <ls_meta>                 LIKE LINE OF rs_component-ctlr_metadata,
+                   <ls_view>                 LIKE LINE OF rs_component-view_metadata,
                    <lt_ctrl_exceptions>      TYPE ANY TABLE,
                    <lt_ctrl_exception_texts> TYPE ANY TABLE.
 
@@ -411,6 +412,10 @@ CLASS ZCL_ABAPGIT_OBJECT_WDYN IMPLEMENTATION.
       ENDIF.
     ENDLOOP.
 
+    LOOP AT rs_component-view_metadata ASSIGNING <ls_view>.
+      SORT <ls_view>-ui_elements.
+    ENDLOOP.
+
     SORT mt_components BY
       component_name ASCENDING
       controller_name ASCENDING