diff --git a/src/01/02/z2ui5_cl_core_action.clas.abap b/src/01/02/z2ui5_cl_core_action.clas.abap
index 6dd71057..c4dc2172 100644
--- a/src/01/02/z2ui5_cl_core_action.clas.abap
+++ b/src/01/02/z2ui5_cl_core_action.clas.abap
@@ -87,6 +87,7 @@ CLASS z2ui5_cl_core_action IMPLEMENTATION.
               DATA(lo_app) = z2ui5_cl_core_app=>db_load( mo_http_post->ms_request-s_control-app_start_draft ).
               result->mo_app = lo_app.
               result->ms_actual-check_on_navigated = abap_true.
+              result->ms_next-s_set-set_app_state_active = abap_true.
               result->mo_app->ms_draft-id_prev_app_stack = ''.
               " check for new app?
 *              TRY.
diff --git a/src/01/02/z2ui5_cl_core_srv_json.clas.abap b/src/01/02/z2ui5_cl_core_srv_json.clas.abap
index dfc619de..cd6ac3f1 100644
--- a/src/01/02/z2ui5_cl_core_srv_json.clas.abap
+++ b/src/01/02/z2ui5_cl_core_srv_json.clas.abap
@@ -163,6 +163,10 @@ CLASS z2ui5_cl_core_srv_json IMPLEMENTATION.
           CATCH cx_root.
         ENDTRY.
 
+        result-s_control-app_start_draft = z2ui5_cl_util=>c_trim_upper(
+                                              z2ui5_cl_util=>url_param_get( val = `z2ui5-xapp-state`
+                                                                            url = result-s_front-search ) ).
+
         IF result-s_control-app_start IS NOT INITIAL.
           IF result-s_control-app_start(1) = `-`.
             REPLACE FIRST OCCURRENCE OF `-` IN result-s_control-app_start WITH `/`.
@@ -176,11 +180,6 @@ CLASS z2ui5_cl_core_srv_json IMPLEMENTATION.
                                                                        url = result-s_front-search ) ).
 
 
-        result-s_control-app_start_draft = z2ui5_cl_util=>c_trim_upper(
-                                              z2ui5_cl_util=>url_param_get( val = `z2ui5-xapp-state`
-                                                                            url = result-s_front-search ) ).
-
-
       CATCH cx_root INTO DATA(x).
         RAISE EXCEPTION TYPE z2ui5_cx_util_error
           EXPORTING