diff --git a/assets/js/tools.js b/assets/js/tools.js
index 49c8827b3..cd7d1db3b 100644
--- a/assets/js/tools.js
+++ b/assets/js/tools.js
@@ -32,7 +32,7 @@ function initFilters() {
   // no display if filters not available
   if ($('div').is('#filters')) {
     $('#button_filters').show();
-    $('.js-filters-action').sidenav({ edge: 'right' });
+    $('#filters.sidenav').sidenav({ edge: 'right' });
     $('#clear_form_filters').on('click', () => {
       $('#filters input').val('');
       $('#filters :checked').removeAttr('checked');
@@ -46,7 +46,7 @@ function initExport() {
   // no display if export not available
   if ($('div').is('#export')) {
     $('#button_export').show();
-    $('.js-export-action').sidenav({ edge: 'right' });
+    $('#export.sidenav').sidenav({ edge: 'right' });
   }
 }
 
diff --git a/assets/scss/_sidenav.scss b/assets/scss/_sidenav.scss
index 7a0e328ba..d57992063 100644
--- a/assets/scss/_sidenav.scss
+++ b/assets/scss/_sidenav.scss
@@ -48,3 +48,8 @@
 .items-number {
   float: right;
 }
+
+.button-filters .sidenav-trigger,
+.button-export .sidenav-trigger {
+  display: block;
+}
diff --git a/templates/Entry/entries.html.twig b/templates/Entry/entries.html.twig
index 625ef03ca..449187bff 100644
--- a/templates/Entry/entries.html.twig
+++ b/templates/Entry/entries.html.twig
@@ -86,7 +86,7 @@
     {% endif %}
 
     <!-- Export -->
-    <div id="export" class="sidenav right-aligned">
+    <div id="export" class="sidenav no-autoinit">
     {% set current_tag = null %}
     {% if tag is defined %}
         {% set current_tag = tag.slug %}
@@ -111,7 +111,7 @@
 
     <!-- Filters -->
     {% if form is not null and is_granted('LIST_ENTRIES') %}
-    <div id="filters" class="sidenav right-aligned">
+    <div id="filters" class="sidenav no-autoinit">
         <form action="{{ path('all') }}">
 
             <h4 class="center">{{ 'entry.filters.title'|trans }}</h4>
diff --git a/templates/layout.html.twig b/templates/layout.html.twig
index 490456567..3ef90be1f 100644
--- a/templates/layout.html.twig
+++ b/templates/layout.html.twig
@@ -107,12 +107,12 @@
                     </li>
                     {% endif %}
                     <li id="button_filters" class="button-filters">
-                        <a class="nav-panel-menu sidenav-trigger-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-target="filters">
+                        <a class="nav-panel-menu sidenav-trigger tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-target="filters">
                             <i class="material-icons">filter_list</i>
                         </a>
                     </li>
                     <li id="button_export" class="button-export">
-                        <a class="nav-panel-menu sidenav-trigger-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-target="export">
+                        <a class="nav-panel-menu sidenav-trigger tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-target="export">
                             <i class="material-icons">file_download</i>
                         </a>
                     </li>