diff --git a/assets/js/admin-views.js b/assets/js/admin-views.js
index 3673c5c292..c9c6b94044 100644
--- a/assets/js/admin-views.js
+++ b/assets/js/admin-views.js
@@ -2071,9 +2071,10 @@
 			   tooltipClass: 'gravityview-item-picker-tooltip top'
 		   } )
 			   // add title attribute so the tooltip can continue to work (jquery ui bug?)
-			   .attr( "title", "" ).on( 'mouseout focusout', function ( e ) {
-			   e.stopImmediatePropagation();
-		   } )
+			   .attr( 'title', function() {
+				   return $( this ).attr( 'title' ) || $( this ).data( 'title' ) || '';
+			   } )
+			   .on( 'mouseout focusout', e => e.stopImmediatePropagation() )
 			   .on( 'click', function ( e, data ) {
 				   // add title attribute so the tooltip can continue to work (jquery ui bug?)
 				   $( this ).attr( "title", "" );
diff --git a/includes/class-admin-views.php b/includes/class-admin-views.php
index f845edb2aa..d8538798a2 100644
--- a/includes/class-admin-views.php
+++ b/includes/class-admin-views.php
@@ -1245,6 +1245,7 @@ function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
 									</div>
 								<div class="gv-droppable-area-action">
 									<a href="#" class="gv-add-field button button-link button-hero" title=""
+									    data-title="<?php echo esc_attr( $button_label ); ?>"
 									    data-templateid="<?php echo esc_attr( $template_id ); ?>"
 										data-objecttype="<?php echo esc_attr( $type ); ?>"
 										data-areaid="<?php echo esc_attr( $zone . '_' . $area['areaid'] ); ?>"