diff --git a/client/res/templates/admin/layouts/grid-panel.tpl b/client/res/templates/admin/layouts/grid-panel.tpl
index e15016a826..6cc27743b4 100644
--- a/client/res/templates/admin/layouts/grid-panel.tpl
+++ b/client/res/templates/admin/layouts/grid-panel.tpl
@@ -45,7 +45,9 @@
                 {{#if hasCustomLabel}}
                 data-custom-label="{{customLabel}}"
                 {{/if}}
-                data-no-label="{{noLabel}}" >
+                data-no-label="{{noLabel}}"
+                title="{{label}}"
+            >
                 <div class="left" style="width: calc(100% - 14px);">{{label}}</div>
                 <div class="right" style="width: 14px;">
                     <a
diff --git a/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl
index 5110f8e048..7ea70c71c5 100644
--- a/client/res/templates/admin/layouts/grid.tpl
+++ b/client/res/templates/admin/layouts/grid.tpl
@@ -26,7 +26,7 @@
             <header>{{translate 'Available Fields' scope='Admin'}}</header>
             <ul class="disabled cells clearfix">
                 {{#each disabledFields}}
-                <li class="cell" data-name="{{./this}}">
+                <li class="cell" data-name="{{./this}}" title="{{translate this scope=../scope category='fields'}}">
                     <div class="left" style="width: calc(100% - 14px);">
                         {{translate this scope=../scope category='fields'}}
                     </div>
diff --git a/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl
index 56269a328f..be292b12c9 100644
--- a/client/res/templates/admin/layouts/rows.tpl
+++ b/client/res/templates/admin/layouts/rows.tpl
@@ -12,7 +12,12 @@
             <header>{{translate 'Enabled' scope='Admin'}}</header>
             <ul class="enabled connected">
                 {{#each layout}}
-                    <li class="cell" draggable="true" {{#each ../dataAttributeList}}data-{{toDom this}}="{{prop ../this this}}" {{/each}}>
+                    <li
+                        class="cell"
+                        draggable="true"
+                        {{#each ../dataAttributeList}}data-{{toDom this}}="{{prop ../this this}}" {{/each}}
+                        title="{{labelText}}"
+                    >
                         <div class="left" style="width: calc(100% - 17px);">
                             <span>{{labelText}}</span>
                         </div>
@@ -40,6 +45,7 @@
                         class="cell"
                         draggable="true"
                         {{#each ../dataAttributeList}}data-{{toDom this}}="{{prop ../this this}}" {{/each}}
+                        title="{{labelText}}"
                     >
                         <div class="left" style="width: calc(100% - 17px);">
                             <span>{{labelText}}</span>