diff --git a/src/ui/zcl_abapgit_gui_page.clas.abap b/src/ui/zcl_abapgit_gui_page.clas.abap
index 83a527e93..1962b36f1 100644
--- a/src/ui/zcl_abapgit_gui_page.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page.clas.abap
@@ -251,7 +251,7 @@ CLASS zcl_abapgit_gui_page IMPLEMENTATION.
     IF mo_settings->get_link_hints_enabled( ) = abap_true AND lv_link_hint_key IS NOT INITIAL.
 
       ii_html->add( |activateLinkHints("{ lv_link_hint_key }");| ).
-      ii_html->add( |setInitialFocusWithQuerySelector('a span', true);| ).
+      ii_html->add( |setInitialFocusWithQuerySelector('#header', false);| ).
       ii_html->add( |enableArrowListNavigation();| ).
 
     ENDIF.