diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap
index f6b554d13..61d6b035a 100644
--- a/src/ui/zcl_abapgit_popups.clas.abap
+++ b/src/ui/zcl_abapgit_popups.clas.abap
@@ -1046,7 +1046,8 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
     " If default transport is set and its type matches, then use it as default for the popup
     ls_e070use = zcl_abapgit_default_transport=>get_instance( )->get( ).
 
-    IF ls_e070use-trfunction = is_transport_type-request AND iv_use_default = abap_true.
+    IF ( ls_e070use-trfunction = is_transport_type-request OR ls_e070use-trfunction IS INITIAL )
+      AND iv_use_default_transport = abap_true.
       lv_order = ls_e070use-ordernum.
     ENDIF.
 
diff --git a/src/ui/zif_abapgit_popups.intf.abap b/src/ui/zif_abapgit_popups.intf.abap
index 6b6d8bcbb..de857d321 100644
--- a/src/ui/zif_abapgit_popups.intf.abap
+++ b/src/ui/zif_abapgit_popups.intf.abap
@@ -99,10 +99,10 @@ INTERFACE zif_abapgit_popups
       zcx_abapgit_exception .
   METHODS popup_transport_request
     IMPORTING
-      !is_transport_type  TYPE zif_abapgit_definitions=>ty_transport_type
-      !iv_use_default     TYPE abap_bool DEFAULT abap_false
+      !is_transport_type        TYPE zif_abapgit_definitions=>ty_transport_type
+      !iv_use_default_transport TYPE abap_bool DEFAULT abap_false
     RETURNING
-      VALUE(rv_transport) TYPE trkorr
+      VALUE(rv_transport)       TYPE trkorr
     RAISING
       zcx_abapgit_exception .
   METHODS choose_pr_popup