diff --git a/assets/controllers/materialize/fab_controller.js b/assets/controllers/materialize/fab_controller.js
index 2bf24e9fa..1d11f38bd 100644
--- a/assets/controllers/materialize/fab_controller.js
+++ b/assets/controllers/materialize/fab_controller.js
@@ -22,6 +22,10 @@ export default class extends Controller {
     }
   }
 
+  click() {
+    this.dispatch('click');
+  }
+
   disconnect() {
     this.instance.destroy();
   }
diff --git a/assets/controllers/sticky_nav_controller.js b/assets/controllers/sticky_nav_controller.js
new file mode 100644
index 000000000..12b405b0e
--- /dev/null
+++ b/assets/controllers/sticky_nav_controller.js
@@ -0,0 +1,7 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+  toggle() {
+    this.element.classList.toggle('entry-nav-top--sticky');
+  }
+}
diff --git a/assets/index.js b/assets/index.js
index a7652e4ad..054c04cff 100755
--- a/assets/index.js
+++ b/assets/index.js
@@ -129,16 +129,7 @@ import './scss/index.scss';
   addDarkThemeListeners();
 }());
 
-const stickyNav = () => {
-  const nav = $('.js-entry-nav-top');
-  $('[data-toggle="actions"]').click(() => {
-    nav.toggleClass('entry-nav-top--sticky');
-  });
-};
-
 $(document).ready(() => {
-  stickyNav();
-
   $('#nav-btn-add-tag').on('click', () => {
     $('.nav-panel-add-tag').toggle();
     $('.nav-panel-menu').addClass('hidden');
diff --git a/templates/Entry/entry.html.twig b/templates/Entry/entry.html.twig
index a42a0723d..666871dec 100644
--- a/templates/Entry/entry.html.twig
+++ b/templates/Entry/entry.html.twig
@@ -10,7 +10,7 @@
     <div class="progress">
         <div class="determinate" data-controller="scroll-indicator" data-action="scroll@window->scroll-indicator#updateWidth"></div>
     </div>
-    <nav class="hide-on-large-only js-entry-nav-top">
+    <nav class="hide-on-large-only" data-controller="sticky-nav" data-action="materialize--fab:click@window->sticky-nav#toggle">
         <div class="nav-panel-item cyan darken-1">
             <ul>
                 <li>
@@ -338,7 +338,7 @@
             {{ entry.content|raw }}
         </article>
 
-        <div class="fixed-action-btn horizontal click-to-toggle hide-on-large-only" data-controller="materialize--fab" data-action="scroll@window->materialize--fab#autoDisplay">
+        <div class="fixed-action-btn horizontal click-to-toggle hide-on-large-only" data-controller="materialize--fab" data-action="scroll@window->materialize--fab#autoDisplay click->materialize--fab#click">
             <a class="btn-floating btn-large" data-toggle="actions">
               <i class="material-icons">menu</i>
             </a>