diff --git a/templates/base.html b/templates/base.html
index 146ad6a4a6d65b9f84383e858ebc611da163c1bf..2a630330738881cafa2781661a53df46c15a84c0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -153,6 +153,7 @@
 			$( function () {
 				moderator.permissioneditor.setpermissions({{global_permissions|tojson|safe}});
 				moderator.api.setcsrftoken('{{ session['_csrf_token'] }}');
+				$('[data-toggle="tooltip"]').tooltip({ 'trigger': 'hover'  });
 			});	
 		</script>
 	{% endif %}
diff --git a/templates/macros.html b/templates/macros.html
index 6f4e88e6e338bd30e14e4ddecb5ae7a0310a29f4..feb47c76115ea16f0406324dbd8f06f45d039dd2 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -186,7 +186,12 @@ $('#embedcodebtn').popover(
 
 {% macro moderator_editor (path,value) %}
 	{% if ismod() %}
-	<span class="moderator_editor" data-path="{{path|join('.')}}" ><a class="moderator_editor_sign btn btn-default" tabindex="0" style="padding: 3px; margin-right: 5px;"><span class="glyphicon glyphicon-pencil"></span></a><span class="moderator_editor_value">{{ value|safe }}</span></span>
+	<span class="moderator_editor" data-path="{{path|join('.')}}" >
+		<a class="moderator_editor_sign btn btn-default" title="{{path|join('.')}}" data-toggle="tooltip" tabindex="0" style="padding: 3px; margin-right: 5px;">
+			<span class="glyphicon glyphicon-pencil"></span>
+		</a>
+		<span class="moderator_editor_value">{{ value|safe }}</span>
+	</span>
 	{% else %}
 		{{value|fixnl|safe}}
 	{% endif %}
@@ -194,7 +199,7 @@ $('#embedcodebtn').popover(
 
 {% macro moderator_checkbox (path,value) %}
 	{% if ismod() %}
-	<input type="checkbox" data-path="{{path|join('.')}}" {% if value %} checked {% endif %} onchange="moderator.editor.changeboxclick(this)"/>
+	<input title="{{path|join('.')}}" data-toggle="tooltip" type="checkbox" data-path="{{path|join('.')}}" {% if value %} checked {% endif %} onchange="moderator.editor.changeboxclick(this)"/>
 	{% endif %}
 {% endmacro %}