diff --git a/src/ui/zabapgit_js_common.w3mi.data.js b/src/ui/zabapgit_js_common.w3mi.data.js
index 0ebb3c9fd..1bb2ba9c3 100644
--- a/src/ui/zabapgit_js_common.w3mi.data.js
+++ b/src/ui/zabapgit_js_common.w3mi.data.js
@@ -2268,10 +2268,18 @@ function enumerateToolbarActions() {
   if (items.length === 0) return;
 
   items = items.map(function(item) {
+    var action = "";
     var anchor = item[0];
+    if (anchor.href.includes("#")) {
+      action = function(){
+        anchor.click();
+      };
+    } else {
+      action = anchor.href.replace("sapevent:", "");
+    }
     var prefix = item[1];
     return {
-      action:    anchor.href.replace("sapevent:", ""),
+      action:    action,
       title:     (prefix ? prefix + ": " : "") + anchor.innerText.trim()
     };
   });
diff --git a/src/ui/zcl_abapgit_gui_page_diff.clas.abap b/src/ui/zcl_abapgit_gui_page_diff.clas.abap
index 4537cef86..5c3b8105e 100644
--- a/src/ui/zcl_abapgit_gui_page_diff.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_diff.clas.abap
@@ -462,7 +462,7 @@ CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION.
 
   METHOD build_menu.
 
-    CREATE OBJECT ro_menu.
+    CREATE OBJECT ro_menu EXPORTING iv_id = 'toolbar-main'.
 
     add_menu_begin( ro_menu ).
     add_jump_sub_menu( ro_menu ).
diff --git a/src/ui/zcl_abapgit_gui_page_stage.clas.abap b/src/ui/zcl_abapgit_gui_page_stage.clas.abap
index 9f954b9ac..913476e3d 100644
--- a/src/ui/zcl_abapgit_gui_page_stage.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_stage.clas.abap
@@ -127,7 +127,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_STAGE IMPLEMENTATION.
 
   METHOD build_menu.
 
-    CREATE OBJECT ro_menu.
+    CREATE OBJECT ro_menu EXPORTING iv_id = 'toolbar-main'.
 
     IF lines( ms_files-local ) > 0
     OR lines( ms_files-remote ) > 0.