diff --git a/app/resources/js/app.js b/app/resources/js/app.js
index 601c399..c3cd4c6 100644
--- a/app/resources/js/app.js
+++ b/app/resources/js/app.js
@@ -19,7 +19,7 @@ const app = new Vue({
         }
     },
     mounted: function() {
-        window.addEventListener('keyup', e => e.keyCode == 191 && this.$refs.searchInput.focus());
+        window.addEventListener('keyup', e => e.key == '/' && this.$refs.searchInput.focus());
 
         let scrollToTop = this.$refs.scrollToTop;
         window.addEventListener('scroll', function() {
diff --git a/app/resources/js/components/file-info-modal.vue b/app/resources/js/components/file-info-modal.vue
index 9e0674e..47ccfe2 100644
--- a/app/resources/js/components/file-info-modal.vue
+++ b/app/resources/js/components/file-info-modal.vue
@@ -86,7 +86,7 @@
             }
         },
         mounted() {
-            window.addEventListener('keyup', e => e.keyCode == 27 && this.hide());
+            window.addEventListener('keyup', e => e.key == 'Escape' && this.hide());
         }
     }
 </script>