diff --git a/core/Resources/views/site/node_admin/_form.html.twig b/core/Resources/views/site/node_admin/_form.html.twig
index 44064ce..42079fd 100644
--- a/core/Resources/views/site/node_admin/_form.html.twig
+++ b/core/Resources/views/site/node_admin/_form.html.twig
@@ -205,7 +205,7 @@
         </div>
 
         {{ form_row(form.disableUrl) }}
-        {{ form_row(form.enableAnalytic) }}
+        {{ form_row(form.enableAnalytics) }}
         {{ form_row(form.code) }}
         {{ form_row(form.contentType) }}
         {{ form_row(form.controller) }}
diff --git a/core/Resources/views/site/tree_admin/navigation.html.twig b/core/Resources/views/site/tree_admin/navigation.html.twig
index f49a211..31efad1 100644
--- a/core/Resources/views/site/tree_admin/navigation.html.twig
+++ b/core/Resources/views/site/tree_admin/navigation.html.twig
@@ -148,9 +148,11 @@
                                                     {% endif %}
                                                 </button>
 
-                                                <button data-modal="{{ analytics }}" class="btn btn-sm btn-light border border-dark mr-1 mb-1">
-                                                    <span data-modal="{{ analytics }}" class="fa fa-chart-bar"></span>
-                                                </button>
+                                                {% if node.enableAnalytics %}
+                                                    <button data-modal="{{ analytics }}" class="btn btn-sm btn-light border border-dark mr-1 mb-1">
+                                                        <span data-modal="{{ analytics }}" class="fa fa-chart-bar"></span>
+                                                    </button>
+                                                {% endif %}
 
                                                 <button data-modal="{{ move }}" class="btn btn-sm btn-dark mr-1 mb-1">
                                                     <span data-modal="{{ move }}" class="fa fa-arrows-alt"></span>
@@ -186,6 +188,12 @@
                                                         {% endif %}
                                                     </button>
 
+                                                    {% if node.enableAnalytics %}
+                                                        <button data-modal="{{ analytics }}" class="dropdown-item">
+                                                            {{ 'Analytics'|trans }}
+                                                        </button>
+                                                    {% endif %}
+
                                                     <button data-modal="{{ move }}" class="dropdown-item">
                                                         {{ 'Move'|trans }}
                                                     </button>