diff --git a/assets/js/register_events.js b/assets/js/register_events.js
index 116a1d7c..e4bf8fe6 100644
--- a/assets/js/register_events.js
+++ b/assets/js/register_events.js
@@ -16,6 +16,7 @@ class RegisterEventHelper {
     }
 
     registerLoadHandler(fn) {
+        document.addEventListener('turbo:render', fn);
         document.addEventListener('turbo:load', fn);
     }
 
@@ -38,7 +39,7 @@ class RegisterEventHelper {
     registerSpecialCharInput() {
         this.registerLoadHandler(() => {
             //@ts-ignore
-            $("input[type=text], textarea, input[type=search]").unbind("keydown").keydown(function (event) {
+            $("input[type=text], input[type=search]").unbind("keydown").keydown(function (event) {
                 let greek = event.altKey;
 
                 let greek_char = "";
diff --git a/assets/js/tristate_checkboxes.js b/assets/js/tristate_checkboxes.js
index 6d78848e..5ec16b19 100644
--- a/assets/js/tristate_checkboxes.js
+++ b/assets/js/tristate_checkboxes.js
@@ -27,7 +27,8 @@ class TristateHelper {
 
     registerTriStateCheckboxes() {
         //Initialize tristate checkboxes and if needed the multicheckbox functionality
-        document.addEventListener("turbo:load", () => {
+
+        const listener = () => {
             $(".tristate").tristate( {
                 checked:            "true",
                 unchecked:          "false",
@@ -44,7 +45,10 @@ class TristateHelper {
                 //@ts-ignore
                 $('.tristate:checkbox', $row).tristate('state', new_state);
             });
-        })
+        }
+
+        document.addEventListener("turbo:load", listener);
+        document.addEventListener("turbo:render", listener);
     }
 }