diff --git a/src/zabapgit_page_main.prog.abap b/src/zabapgit_page_main.prog.abap
index 793076547..437da9aed 100644
--- a/src/zabapgit_page_main.prog.abap
+++ b/src/zabapgit_page_main.prog.abap
@@ -57,8 +57,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
   METHOD lif_gui_page~on_event.
 
-    DATA: lv_key  TYPE lcl_persistence_repo=>ty_repo-key,
-          lo_repo TYPE REF TO lcl_repo.
+    DATA: lv_key  TYPE lcl_persistence_repo=>ty_repo-key.
 
     mo_repo_content->lif_gui_page~on_event(
       EXPORTING
@@ -80,12 +79,11 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
       WHEN c_actions-show.              " Change displayed repo
         lcl_app=>user( )->set_repo_show( lv_key ).
         TRY.
-            lo_repo = lcl_app=>repo_srv( )->get( lv_key ).
-            lo_repo->refresh( ).
+            lcl_app=>repo_srv( )->get( lv_key )->refresh( ).
           CATCH lcx_exception.
         ENDTRY.
 
-        CREATE OBJECT mo_repo_content EXPORTING io_repo = lo_repo. " Reinit content state
+        CREATE OBJECT mo_repo_content EXPORTING iv_key = lv_key. " Reinit content state
         ev_state = gc_event_state-re_render.
     ENDCASE.
 
@@ -283,7 +281,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
     CREATE OBJECT ro_html.
 
     IF mo_repo_content IS NOT BOUND.
-      CREATE OBJECT mo_repo_content EXPORTING io_repo = io_repo.
+      CREATE OBJECT mo_repo_content EXPORTING iv_key = io_repo->get_key( ).
     ENDIF.
 
     ro_html->add( |<div class="repo" id="repo{ io_repo->get_key( ) }">| ).
diff --git a/src/zabapgit_view_repo.prog.abap b/src/zabapgit_view_repo.prog.abap
index 8ed079c17..1c8d5b091 100644
--- a/src/zabapgit_view_repo.prog.abap
+++ b/src/zabapgit_view_repo.prog.abap
@@ -235,7 +235,7 @@ CLASS lcl_gui_view_repo_content DEFINITION FINAL INHERITING FROM lcl_gui_page_su
              lif_gui_page~on_event   REDEFINITION.
 
     METHODS constructor
-      IMPORTING io_repo TYPE REF TO lcl_repo
+      IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key
       RAISING   lcx_exception.
 
   PRIVATE SECTION.
@@ -286,7 +286,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
 
     super->constructor( ).
 
-    mo_repo        ?= io_repo.
+    mo_repo         = lcl_app=>repo_srv( )->get( iv_key ).
     mv_cur_dir      = '/'. " Root
     mv_hide_files   = lcl_app=>user( )->get_hide_files( ).
     mv_changes_only = lcl_app=>user( )->get_changes_only( ).
@@ -325,6 +325,9 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
 
     FIELD-SYMBOLS <ls_item> LIKE LINE OF lt_repo_items.
 
+    " Reinit, for the case of type change
+    mo_repo = lcl_app=>repo_srv( )->get( mo_repo->get_key( ) ).
+
     CREATE OBJECT ro_html.
 
     TRY.