diff --git a/src/ui/zcl_abapgit_gui_page_sett_remo.clas.abap b/src/ui/zcl_abapgit_gui_page_sett_remo.clas.abap
index 10db4b25d..d09fb1a0b 100644
--- a/src/ui/zcl_abapgit_gui_page_sett_remo.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_sett_remo.clas.abap
@@ -171,7 +171,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_GUI_PAGE_SETT_REMO IMPLEMENTATION.
 
 
   METHOD checkout_commit_build_list.
@@ -288,6 +288,8 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
 
     DATA:
       lo_repo   TYPE REF TO zcl_abapgit_repo_online,
+      lv_url    LIKE lo_repo->ms_data-url,
+      lv_branch_name LIKE lo_repo->ms_data-branch_name,
       ls_branch TYPE zif_abapgit_definitions=>ty_git_branch.
 
     IF mo_repo->is_offline( ) = abap_true.
@@ -296,9 +298,16 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
 
     lo_repo ?= mo_repo.
 
+    IF lo_repo->ms_data-switched_origin IS NOT INITIAL.
+      SPLIT lo_repo->ms_data-switched_origin AT '@' INTO lv_url lv_branch_name.
+    ELSE.
+      lv_url          = lo_repo->get_url( ).
+      lv_branch_name  = lo_repo->get_selected_branch( ).
+    ENDIF.
+
     ls_branch = zcl_abapgit_ui_factory=>get_popups( )->branch_list_popup(
-      iv_url             = lo_repo->get_url( )
-      iv_default_branch  = lo_repo->get_selected_branch( )
+      iv_url             = lv_url
+      iv_default_branch  = lv_branch_name
       iv_show_new_option = abap_false ).
 
     IF ls_branch IS NOT INITIAL.