diff --git a/src/zabapgit_app.prog.abap b/src/zabapgit_app.prog.abap
index da8b71e6c..cdfcd79fc 100644
--- a/src/zabapgit_app.prog.abap
+++ b/src/zabapgit_app.prog.abap
@@ -14,9 +14,6 @@ CLASS lcl_persist_settings DEFINITION DEFERRED.
 CLASS lcl_app DEFINITION FINAL.
   PUBLIC SECTION.
 
-    CLASS-METHODS run
-      RAISING lcx_exception.
-
     CLASS-METHODS gui
       RETURNING VALUE(ro_gui) TYPE REF TO lcl_gui
       RAISING   lcx_exception.
diff --git a/src/zabapgit_app_impl.prog.abap b/src/zabapgit_app_impl.prog.abap
index f41691290..831819ced 100644
--- a/src/zabapgit_app_impl.prog.abap
+++ b/src/zabapgit_app_impl.prog.abap
@@ -7,17 +7,6 @@
 *----------------------------------------------------------------------*
 CLASS lcl_app IMPLEMENTATION.
 
-  METHOD run.
-
-    IF sy-batch = abap_true.
-      lcl_background=>run( ).
-    ELSE.
-      gui( )->go_home( ).
-      CALL SELECTION-SCREEN 1001. " trigger screen
-    ENDIF.
-
-  ENDMETHOD.      "run
-
   METHOD gui.
 
     IF go_gui IS NOT BOUND.
diff --git a/src/zabapgit_forms.prog.abap b/src/zabapgit_forms.prog.abap
index cf0e13bb5..3cae67f9c 100644
--- a/src/zabapgit_forms.prog.abap
+++ b/src/zabapgit_forms.prog.abap
@@ -22,13 +22,24 @@ FORM run.
 
   TRY.
       lcl_migrations=>run( ).
-      lcl_app=>run( ).
+      PERFORM open_gui.
     CATCH lcx_exception INTO lx_exception.
       MESSAGE lx_exception->mv_text TYPE 'E'.
   ENDTRY.
 
 ENDFORM.                    "run
 
+FORM open_gui RAISING lcx_exception.
+
+  IF sy-batch = abap_true.
+    lcl_background=>run( ).
+  ELSE.
+    lcl_app=>gui( )->go_home( ).
+    CALL SELECTION-SCREEN 1001. " trigger screen
+  ENDIF.
+
+ENDFORM.
+
 *&---------------------------------------------------------------------*
 *&      Form  branch_popup
 *&---------------------------------------------------------------------*