diff --git a/lib/controllers/base_controller.rb b/lib/controllers/base_controller.rb
index 933058a5..e1a4fd3e 100644
--- a/lib/controllers/base_controller.rb
+++ b/lib/controllers/base_controller.rb
@@ -50,5 +50,20 @@ def prevent_unauthorized_modifications
         redirect back
       end
     end
+
+    def javascript_imports
+      imports =
+        {
+          imports: {
+            "@hotwired/turbo": "https://cdn.jsdelivr.net/npm/@hotwired/turbo@8.0.5/+esm",
+            "@hotwired/stimulus": "https://cdn.jsdelivr.net/npm/@hotwired/stimulus@3.2.2/+esm",
+            "controllers/page_navigation_controller": "/javascripts/controllers/page_navigation_controller.js",
+            "controllers/search_navigation_controller": "/javascripts/controllers/search_navigation_controller.js",
+            "application": "/javascripts/application.js"
+          }
+        }
+
+      JSON.pretty_generate(imports)
+    end
   end
 end
diff --git a/lib/controllers/page_controller.rb b/lib/controllers/page_controller.rb
index cac5b80a..a36c0e55 100644
--- a/lib/controllers/page_controller.rb
+++ b/lib/controllers/page_controller.rb
@@ -54,10 +54,10 @@ def restrict_concealed(page)
     case @pages.count
     when 0
       flash[:notice] = "Din sökning gav inga träffar"
-      redirect request.referrer
+      redirect request.referrer, 303
     when 1
       flash[:confirm] = "Din sökning gav bara denna sida som träff"
-      redirect @pages.first.slug
+      redirect @pages.first.slug, 303
     else
       flash.now[:confirm] = "Din sökning gav #{@pages.count} träffar"
       haml :search
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
new file mode 100644
index 00000000..e617f594
--- /dev/null
+++ b/public/javascripts/application.js
@@ -0,0 +1,9 @@
+import { Application } from "@hotwired/stimulus"
+import "@hotwired/turbo"
+
+import PageNavigationController from "controllers/page_navigation_controller"
+import SearchNavigationController from "controllers/search_navigation_controller"
+
+window.Stimulus = Application.start()
+Stimulus.register("page-navigation", PageNavigationController)
+Stimulus.register("search-navigation", SearchNavigationController)
diff --git a/public/javascripts/controllers/page_navigation_controller.js b/public/javascripts/controllers/page_navigation_controller.js
new file mode 100644
index 00000000..12c3d6bb
--- /dev/null
+++ b/public/javascripts/controllers/page_navigation_controller.js
@@ -0,0 +1,59 @@
+import {Controller} from "@hotwired/stimulus"
+import * as Turbo from "@hotwired/turbo"
+
+export default class extends Controller {
+  home(event) {
+    if (this.#isInputField(event.target)) {
+      Turbo.visit("/")
+    }
+  }
+
+  list(event) {
+    if (this.#isInputField(event.target)) {
+      Turbo.visit("/list")
+    }
+  }
+
+  latest(event) {
+    if (this.#isInputField(event.target)) {
+      Turbo.visit("/latest")
+    }
+  }
+
+  new(event) {
+    if (this.#isInputField(event.target)) {
+      Turbo.visit("/new")
+    }
+  }
+
+  edit(event) {
+    if (this.#isInputField(event.target)) {
+      let editPageLink = document.querySelector("#edit_page")
+      if (editPageLink) {
+        Turbo.visit(editPageLink.href)
+      }
+    }
+  }
+
+  focusSearch(event) {
+    if (this.#isInputField(event.target)) {
+      let searchInput = document.getElementById('q')
+      searchInput.focus()
+      searchInput.select()
+      event.preventDefault()
+    }
+  }
+
+  blurSearch(event) {
+    let searchInput = document.getElementById('q');
+    if (event.target === searchInput) {
+      searchInput.blur();
+    }
+    event.preventDefault()
+  }
+
+  #isInputField(target) {
+    let targetTag = target.tagName.toLowerCase()
+    return targetTag !== 'input' && targetTag !== 'textarea' && targetTag !== 'select'
+  }
+}
diff --git a/public/javascripts/controllers/search_navigation_controller.js b/public/javascripts/controllers/search_navigation_controller.js
new file mode 100644
index 00000000..4963b299
--- /dev/null
+++ b/public/javascripts/controllers/search_navigation_controller.js
@@ -0,0 +1,75 @@
+import {Controller} from "@hotwired/stimulus"
+import * as Turbo from "@hotwired/turbo"
+
+export default class extends Controller {
+  connect() {
+    let selectedLink = this.#getSelectedElement();
+    if (!selectedLink) {
+      let pageLinks = document.getElementsByClassName('page-link');
+      if (pageLinks && pageLinks.length > 0) {
+        this.#selectElement(pageLinks[0]);
+      }
+    }
+  }
+
+  down() {
+    let selectedLink = this.#getSelectedElement();
+    if (selectedLink) {
+      let pageLinks = document.getElementsByClassName('page-link');
+
+      for (let i = 0; i < pageLinks.length; i++) {
+        let page = pageLinks[i];
+        if (page === selectedLink && i < (pageLinks.length - 1)) {
+          this.#selectElement(pageLinks[i + 1])
+          this.#deselectElement(pageLinks[i]);
+          break;
+        }
+      }
+      return false;
+    }
+  }
+
+  up() {
+    let selectedLink = this.#getSelectedElement();
+    if (selectedLink) {
+      let pageLinks = document.getElementsByClassName('page-link');
+
+      for (let i = 0; i < pageLinks.length; i++) {
+        let page = pageLinks[i];
+        if (page === selectedLink && i > 0) {
+          this.#selectElement(pageLinks[i - 1])
+          this.#deselectElement(pageLinks[i]);
+          break;
+        }
+      }
+      return false;
+    }
+  }
+
+  open() {
+    let selectedLink = this.#getSelectedElement();
+    if (selectedLink) {
+      selectedLink.click()
+      return false;
+    }
+  }
+
+  #getSelectedElement() {
+    return document.getElementById('navigation-selected');
+  }
+
+  #selectElement(element) {
+    element.id = "navigation-selected";
+    return true;
+  }
+
+  #deselectElement(element) {
+    element.id = "";
+    return true;
+  }
+
+  #isInputField(target) {
+    let targetTag = target.tagName.toLowerCase()
+    return targetTag !== 'input' && targetTag !== 'textarea' && targetTag !== 'select'
+  }
+}
diff --git a/public/javascripts/mousetrap-global-bind.min.js b/public/javascripts/mousetrap-global-bind.min.js
deleted file mode 100755
index 636b25e0..00000000
--- a/public/javascripts/mousetrap-global-bind.min.js
+++ /dev/null
@@ -1 +0,0 @@
-Mousetrap=function(a){var d={},e=a.stopCallback;a.stopCallback=function(b,c,a){return d[a]?!1:e(b,c,a)};a.bindGlobal=function(b,c,e){a.bind(b,c,e);if(b instanceof Array)for(c=0;c<b.length;c++)d[b[c]]=!0;else d[b]=!0};return a}(Mousetrap);
diff --git a/public/javascripts/mousetrap.min.js b/public/javascripts/mousetrap.min.js
deleted file mode 100755
index 114a2223..00000000
--- a/public/javascripts/mousetrap.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* mousetrap v1.4.6 craig.is/killing/mice */
-(function(J,r,f){function s(a,b,d){a.addEventListener?a.addEventListener(b,d,!1):a.attachEvent("on"+b,d)}function A(a){if("keypress"==a.type){var b=String.fromCharCode(a.which);a.shiftKey||(b=b.toLowerCase());return b}return h[a.which]?h[a.which]:B[a.which]?B[a.which]:String.fromCharCode(a.which).toLowerCase()}function t(a){a=a||{};var b=!1,d;for(d in n)a[d]?b=!0:n[d]=0;b||(u=!1)}function C(a,b,d,c,e,v){var g,k,f=[],h=d.type;if(!l[a])return[];"keyup"==h&&w(a)&&(b=[a]);for(g=0;g<l[a].length;++g)if(k=
-l[a][g],!(!c&&k.seq&&n[k.seq]!=k.level||h!=k.action||("keypress"!=h||d.metaKey||d.ctrlKey)&&b.sort().join(",")!==k.modifiers.sort().join(","))){var m=c&&k.seq==c&&k.level==v;(!c&&k.combo==e||m)&&l[a].splice(g,1);f.push(k)}return f}function K(a){var b=[];a.shiftKey&&b.push("shift");a.altKey&&b.push("alt");a.ctrlKey&&b.push("ctrl");a.metaKey&&b.push("meta");return b}function x(a,b,d,c){m.stopCallback(b,b.target||b.srcElement,d,c)||!1!==a(b,d)||(b.preventDefault?b.preventDefault():b.returnValue=!1,b.stopPropagation?
-b.stopPropagation():b.cancelBubble=!0)}function y(a){"number"!==typeof a.which&&(a.which=a.keyCode);var b=A(a);b&&("keyup"==a.type&&z===b?z=!1:m.handleKey(b,K(a),a))}function w(a){return"shift"==a||"ctrl"==a||"alt"==a||"meta"==a}function L(a,b,d,c){function e(b){return function(){u=b;++n[a];clearTimeout(D);D=setTimeout(t,1E3)}}function v(b){x(d,b,a);"keyup"!==c&&(z=A(b));setTimeout(t,10)}for(var g=n[a]=0;g<b.length;++g){var f=g+1===b.length?v:e(c||E(b[g+1]).action);F(b[g],f,c,a,g)}}function E(a,b){var d,
-c,e,f=[];d="+"===a?["+"]:a.split("+");for(e=0;e<d.length;++e)c=d[e],G[c]&&(c=G[c]),b&&"keypress"!=b&&H[c]&&(c=H[c],f.push("shift")),w(c)&&f.push(c);d=c;e=b;if(!e){if(!p){p={};for(var g in h)95<g&&112>g||h.hasOwnProperty(g)&&(p[h[g]]=g)}e=p[d]?"keydown":"keypress"}"keypress"==e&&f.length&&(e="keydown");return{key:c,modifiers:f,action:e}}function F(a,b,d,c,e){q[a+":"+d]=b;a=a.replace(/\s+/g," ");var f=a.split(" ");1<f.length?L(a,f,b,d):(d=E(a,d),l[d.key]=l[d.key]||[],C(d.key,d.modifiers,{type:d.action},
-c,a,e),l[d.key][c?"unshift":"push"]({callback:b,modifiers:d.modifiers,action:d.action,seq:c,level:e,combo:a}))}var h={8:"backspace",9:"tab",13:"enter",16:"shift",17:"ctrl",18:"alt",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"ins",46:"del",91:"meta",93:"meta",224:"meta"},B={106:"*",107:"+",109:"-",110:".",111:"/",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},H={"~":"`","!":"1",
-"@":"2","#":"3",$:"4","%":"5","^":"6","&":"7","*":"8","(":"9",")":"0",_:"-","+":"=",":":";",'"':"'","<":",",">":".","?":"/","|":"\\"},G={option:"alt",command:"meta","return":"enter",escape:"esc",mod:/Mac|iPod|iPhone|iPad/.test(navigator.platform)?"meta":"ctrl"},p,l={},q={},n={},D,z=!1,I=!1,u=!1;for(f=1;20>f;++f)h[111+f]="f"+f;for(f=0;9>=f;++f)h[f+96]=f;s(r,"keypress",y);s(r,"keydown",y);s(r,"keyup",y);var m={bind:function(a,b,d){a=a instanceof Array?a:[a];for(var c=0;c<a.length;++c)F(a[c],b,d);return this},
-unbind:function(a,b){return m.bind(a,function(){},b)},trigger:function(a,b){if(q[a+":"+b])q[a+":"+b]({},a);return this},reset:function(){l={};q={};return this},stopCallback:function(a,b){return-1<(" "+b.className+" ").indexOf(" mousetrap ")?!1:"INPUT"==b.tagName||"SELECT"==b.tagName||"TEXTAREA"==b.tagName||b.isContentEditable},handleKey:function(a,b,d){var c=C(a,b,d),e;b={};var f=0,g=!1;for(e=0;e<c.length;++e)c[e].seq&&(f=Math.max(f,c[e].level));for(e=0;e<c.length;++e)c[e].seq?c[e].level==f&&(g=!0,
-b[c[e].seq]=1,x(c[e].callback,d,c[e].combo,c[e].seq)):g||x(c[e].callback,d,c[e].combo);c="keypress"==d.type&&I;d.type!=u||w(a)||c||t(b);I=g&&"keydown"==d.type}};J.Mousetrap=m;"function"===typeof define&&define.amd&&define(m)})(window,document);
diff --git a/views/layout.haml b/views/layout.haml
index a960fc74..b2fff732 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -8,11 +8,28 @@
       Starkast Wiki
     %link{ href: '/favicon.ico', rel: 'shortcut icon', type: 'image/ico' }
     %link{ href: "/stylesheets/default.css?#{App.cache_bust}", rel: 'stylesheet', type: 'text/css' }
-    %script{ src: '/javascripts/mousetrap.min.js' }
-    %script{ src: '/javascripts/mousetrap-global-bind.min.js' }
     - settings.js.each do |js|
       %script{ src: js.fetch(:url), integrity: js.fetch(:sha), crossorigin: :anonymous }
-  %body
+    %script{type: "importmap"}
+      != javascript_imports
+    %script{type: "module"}
+      import "application"
+  %body{data: {
+          controller: "page-navigation search-navigation",
+          action: "keydown.h->page-navigation#home |
+                   keydown.i->page-navigation#list |
+                   keydown.l->page-navigation#latest |
+                   keydown.n->page-navigation#new |
+                   keydown.e->page-navigation#edit |
+                   keydown.s->page-navigation#focusSearch |
+                   keydown.esc->page-navigation#blurSearch |
+                   keydown.down->search-navigation#down |
+                   keydown.j->search-navigation#down |
+                   keydown.up->search-navigation#up |
+                   keydown.k->search-navigation#up |
+                   keydown.o->search-navigation#open |
+                   keydown.enter->search-navigation#open"
+        }}
     %div{ id: @edit_mode ? 'container-lg' : 'container' }
       #header
         #login
@@ -33,39 +50,3 @@
         !=yield
     #footer
       != haml :'../layouts/_footer', layout: false
-
-    :javascript
-      Mousetrap.bind(['/', 's'], function() {
-        var searchInput = document.getElementById('q');
-        searchInput.focus();
-        searchInput.select();
-        return false;
-      });
-
-      Mousetrap.bind('h', function() {
-        window.location = "/";
-        return false;
-      });
-
-      Mousetrap.bind('i', function() {
-        window.location = "/list";
-        return false;
-      });
-
-      Mousetrap.bind('l', function() {
-        window.location = "/latest";
-        return false;
-      });
-
-      Mousetrap.bind('n', function() {
-        window.location = "/new";
-        return false;
-      });
-
-      Mousetrap.bindGlobal('escape', function() {
-        var searchInput = document.getElementById('q');
-        if (document.activeElement == searchInput) {
-          searchInput.blur();
-        }
-        return false;
-      });
diff --git a/views/page/_actions.haml b/views/page/_actions.haml
index f77bb3a2..82c631f3 100644
--- a/views/page/_actions.haml
+++ b/views/page/_actions.haml
@@ -2,7 +2,7 @@
   %ul
     - if logged_in?
       %li
-        %a{ href: "/#{@page.slug}/edit" } Ändra
+        %a{ href: "/#{@page.slug}/edit", id: "edit_page" } Ändra
         - if starkast?
           %form{ action: "/#{@page.slug}/conceal", method: :post }
             %button
diff --git a/views/page/search.haml b/views/page/search.haml
index 0ced90c7..a1f1f26b 100644
--- a/views/page/search.haml
+++ b/views/page/search.haml
@@ -6,53 +6,3 @@
       - if page.concealed
         🔐
       %span.description= page.description
-
-:javascript
-  (function(){
-    function getSelectedElement() {
-      return document.getElementById('navigation-selected');
-    }
-    function selectElement(element) {
-      element.id = "navigation-selected";
-      return true;
-    }
-    function deselectElement(element) {
-      element.id = "";
-      return true;
-    }
-
-    var pageLinks = document.getElementsByClassName('page-link');
-    selectElement(pageLinks[0]);
-
-    Mousetrap.bind(['o', 'enter'], function() {
-      getSelectedElement().click();
-      return false;
-    });
-
-    Mousetrap.bind(['j', 'down'], function() {
-      var selectedLink = getSelectedElement();
-      for (var i = 0; i < pageLinks.length; i++) {
-        var page = pageLinks[i];
-        if (page == selectedLink && i < (pageLinks.length - 1)) {
-          selectElement(pageLinks[i + 1])
-          deselectElement(pageLinks[i]);
-          break;
-        }
-      }
-      return false;
-    });
-
-    Mousetrap.bind(['k', 'up'], function() {
-      var selectedLink = getSelectedElement();
-      for (var i = 0; i < pageLinks.length; i++) {
-        var page = pageLinks[i];
-        if (page == selectedLink && i > 0) {
-          selectElement(pageLinks[i - 1])
-          deselectElement(pageLinks[i]);
-          break;
-        }
-      }
-      return false;
-    });
-  })();
-
diff --git a/views/page/show.haml b/views/page/show.haml
index 1b636110..8da4d760 100644
--- a/views/page/show.haml
+++ b/views/page/show.haml
@@ -1,9 +1,3 @@
 %h1.title= @page.title
 
 !~ @page.compiled_content
-
-:javascript
-  Mousetrap.bind('e', function() {
-    window.location = "#{@page.slug}/edit";
-    return false;
-  });