diff --git a/src/ui/core/zcl_abapgit_gui.clas.abap b/src/ui/core/zcl_abapgit_gui.clas.abap
index b3b3ba422..c6cfc8854 100644
--- a/src/ui/core/zcl_abapgit_gui.clas.abap
+++ b/src/ui/core/zcl_abapgit_gui.clas.abap
@@ -371,16 +371,7 @@ CLASS zcl_abapgit_gui IMPLEMENTATION.
 
 
   METHOD set_focus.
-    cl_gui_control=>set_focus(
-      EXPORTING
-        control           = mi_html_viewer->get_viewer( )
-      EXCEPTIONS
-        cntl_error        = 1
-        cntl_system_error = 2
-        OTHERS            = 3 ).
-    IF sy-subrc <> 0.
-      zcx_abapgit_exception=>raise( |Error in: cl_gui_control=>set_focus - SUBRC = { sy-subrc }| ).
-    ENDIF.
+    mi_html_viewer->set_focus( ).
   ENDMETHOD.
 
 
diff --git a/src/ui/core/zcl_abapgit_html_viewer_gui.clas.abap b/src/ui/core/zcl_abapgit_html_viewer_gui.clas.abap
index c4e096c09..5850861c3 100644
--- a/src/ui/core/zcl_abapgit_html_viewer_gui.clas.abap
+++ b/src/ui/core/zcl_abapgit_html_viewer_gui.clas.abap
@@ -16,7 +16,7 @@ CLASS zcl_abapgit_html_viewer_gui DEFINITION
     DATA mo_html_viewer TYPE REF TO cl_gui_html_viewer .
 
     METHODS on_event
-      FOR EVENT sapevent OF cl_gui_html_viewer
+        FOR EVENT sapevent OF cl_gui_html_viewer
       IMPORTING
         !action
         !frame
@@ -96,11 +96,6 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD zif_abapgit_html_viewer~get_viewer.
-    ro_result = mo_html_viewer.
-  ENDMETHOD.
-
-
   METHOD zif_abapgit_html_viewer~load_data.
 
     DATA lv_url TYPE c LENGTH 250.
@@ -132,6 +127,20 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD zif_abapgit_html_viewer~set_focus.
+    cl_gui_control=>set_focus(
+      EXPORTING
+        control           = mo_html_viewer
+      EXCEPTIONS
+        cntl_error        = 1
+        cntl_system_error = 2
+        OTHERS            = 3 ).
+    IF sy-subrc <> 0.
+      zcx_abapgit_exception=>raise( |Error in: cl_gui_control=>set_focus - SUBRC = { sy-subrc }| ).
+    ENDIF.
+  ENDMETHOD.
+
+
   METHOD zif_abapgit_html_viewer~set_registered_events.
 
     mo_html_viewer->set_registered_events(
diff --git a/src/ui/core/zif_abapgit_html_viewer.intf.abap b/src/ui/core/zif_abapgit_html_viewer.intf.abap
index 19ae5886e..066ed2c31 100644
--- a/src/ui/core/zif_abapgit_html_viewer.intf.abap
+++ b/src/ui/core/zif_abapgit_html_viewer.intf.abap
@@ -55,7 +55,5 @@ INTERFACE zif_abapgit_html_viewer
   METHODS set_visiblity
     IMPORTING
       !iv_visible TYPE abap_bool .
-  METHODS get_viewer
-    RETURNING
-      VALUE(ro_result) TYPE REF TO cl_gui_html_viewer .
+  METHODS set_focus RAISING zcx_abapgit_exception.
 ENDINTERFACE.