diff --git a/api/js/etemplate/et2_widget_toolbar.js b/api/js/etemplate/et2_widget_toolbar.js
index afbf5d41c8..3fbe960455 100644
--- a/api/js/etemplate/et2_widget_toolbar.js
+++ b/api/js/etemplate/et2_widget_toolbar.js
@@ -493,10 +493,11 @@ var et2_toolbar = (function(){ "use strict"; return et2_DOMWidget.extend([et2_II
 		var button = jQuery(document.createElement('button'))
 			.addClass("et2_button et2_button_text et2_button_with_image")
 			.attr('id', this.id+'-'+action.id)
-			.attr('title', (action.hint ? action.hint : action.caption) + (action.shortcut ? ' ('+action.shortcut.caption+')' : ''))
 			.attr('type', 'button')
 			.appendTo(this.preference[action.id]?this.actionbox.children()[1]:jQuery('[data-group='+action.group+']',this.actionlist));
 
+		this.egw().tooltipBind(button, action.hint ? action.hint : action.caption) + (action.shortcut ? ' ('+action.shortcut.caption+')' : '');
+
 		if (action && action.checkbox)
 		{
 			if (action.data.toggle_on || action.data.toggle_off)
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index b1ab619450..d680382414 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -899,7 +899,7 @@ ul.et2_link_string {
   background-color: #FDF9DB;
   max-width: 300px;
   color: black;
-  z-index: 102;
+  z-index: 1002;
   -webkit-box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.75);
   -moz-box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.75);
   box-shadow: 2px 2px 10px 0px rgba(0,0,0,0.75);