diff --git a/src/z2ui5_cl_fw_http_handler.clas.abap b/src/z2ui5_cl_fw_http_handler.clas.abap
index e9a0d7d7..044f78be 100644
--- a/src/z2ui5_cl_fw_http_handler.clas.abap
+++ b/src/z2ui5_cl_fw_http_handler.clas.abap
@@ -24,6 +24,7 @@ CLASS z2ui5_cl_fw_http_handler DEFINITION
   PROTECTED SECTION.
   PRIVATE SECTION.
 
+
 ENDCLASS.
 
 
@@ -248,6 +249,23 @@ CLASS Z2UI5_CL_FW_HTTP_HANDLER IMPLEMENTATION.
                            `            onEventFrontend: (...args) => {` && |\n| &&
                                custom_js_oneventfrontend &&
                            `                switch (args[0].EVENT) {` && |\n| &&
+                           `  case 'CROSS_APP_NAV_TO_PREV_APP': ` && |\n| &&
+                           `  var oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation"); ` && |\n| &&
+                           ` oCrossAppNavigator.backToPreviousApp();` && |\n| &&
+                           ` break;` && |\n| &&
+                           `  case 'CROSS_APP_NAV_TO_EXT': ` && |\n| &&
+                           ` var oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");` && |\n|  &&
+                           |\n|  &&
+                           `  const hash = ( oCrossAppNavigator.hrefForExternal({` && |\n|  &&
+                           `    target: args[1],` && |\n|  &&
+                           `    params: args[2]` && |\n|  &&
+                           `  })) || "";` && |\n|  &&
+                           |\n|  &&
+                           `  oCrossAppNavigator.toExternal({` && |\n|  &&
+                           `    target: {` && |\n|  &&
+                           `      shellHash: hash` && |\n|  &&
+                           `    }` && |\n|  &&
+                           `  });  break;` && |\n|  &&
                            `                    case 'LOCATION_RELOAD':` && |\n| &&
                            `                        window.location = args[1];` && |\n| &&
                            `                        break;` && |\n| &&
diff --git a/src/z2ui5_if_client.intf.abap b/src/z2ui5_if_client.intf.abap
index 940818ae..d8a90133 100644
--- a/src/z2ui5_if_client.intf.abap
+++ b/src/z2ui5_if_client.intf.abap
@@ -3,13 +3,15 @@ INTERFACE z2ui5_if_client
 
   CONSTANTS:
     BEGIN OF cs_event,
-      popup_close            TYPE string VALUE `POPUP_CLOSE`,
-      open_new_tab           TYPE string VALUE `OPEN_NEW_TAB`,
-      popover_close          TYPE string VALUE `POPOVER_CLOSE`,
-      location_reload        TYPE string VALUE `LOCATION_RELOAD`,
-      nav_container_to       TYPE string VALUE `NAV_CONTAINER_TO`,
-      nest_nav_container_to  TYPE string VALUE `NEST_NAV_CONTAINER_TO`,
-      nest2_nav_container_to TYPE string VALUE `NEST2_NAV_CONTAINER_TO`,
+      popup_close                TYPE string VALUE `POPUP_CLOSE`,
+      open_new_tab               TYPE string VALUE `OPEN_NEW_TAB`,
+      popover_close              TYPE string VALUE `POPOVER_CLOSE`,
+      location_reload            TYPE string VALUE `LOCATION_RELOAD`,
+      nav_container_to           TYPE string VALUE `NAV_CONTAINER_TO`,
+      nest_nav_container_to      TYPE string VALUE `NEST_NAV_CONTAINER_TO`,
+      nest2_nav_container_to     TYPE string VALUE `NEST2_NAV_CONTAINER_TO`,
+      CROSS_APP_NAV_TO_EXT TYPE string VALUE `CROSS_APP_NAV_TO_EXT`,
+      CROSS_APP_NAV_TO_PREV_APP TYPE string VALUE `CROSS_APP_NAV_TO_PREV_APP`,
     END OF cs_event.
 
   CONSTANTS: