diff --git a/lib/IHP/static/helpers.js b/lib/IHP/static/helpers.js
index 66fb2a97e..57a3dcdf5 100644
--- a/lib/IHP/static/helpers.js
+++ b/lib/IHP/static/helpers.js
@@ -8,7 +8,6 @@ window.addEventListener('beforeunload', function () {
 document.addEventListener('DOMContentLoaded', function () {
     initDelete();
     initDisableButtonsOnSubmit();
-    initBack();
     initToggle();
     initTime();
     initDatePicker();
@@ -19,7 +18,6 @@ document.addEventListener('DOMContentLoaded', function () {
 
 document.addEventListener('turbolinks:load', function () {
     initDelete();
-    initBack();
     initToggle();
     initTime();
     initFileUploadPreview();
@@ -117,35 +115,12 @@ function initDelete() {
     }
 }
 
-function initBack() {
-    var elements = document.getElementsByClassName('js-back');
-
-    function handleClick(event) {
-        event.preventDefault();
-        event.target.setAttribute('disabled', 'disabled');
-        event.target.classList.add('disabled');
-
-        window.history.back();
-    }
-
-    for (var i in elements) {
-        var element = elements[i];
-        if (element instanceof HTMLButtonElement) {
-            element.addEventListener('click', handleClick);
-        } else if (element instanceof HTMLAnchorElement) {
-            console.error(
-                'js-back does not supports <a> elements, use a <button> instead',
-                element
-            );
-        }
-    }
-}
-
 function initDisableButtonsOnSubmit() {
-    if (window.initDisableButtonsOnSubmitRun) {
+    if (Boolean(document.initDisableButtonsOnSubmit) === true) {
         return;
     }
-    window.initDisableButtonsOnSubmitRun = true;
+
+    document.initDisableButtonsOnSubmit = true;
 
     var lastClicked = null;
     document.addEventListener('submit', function (event) {
@@ -169,8 +144,8 @@ window.submitForm = function (form, possibleClickedButton) {
     // We cannot use `form.action` here because there could be a <input name="action"/>
     // See https://github.com/digitallyinduced/ihp/issues/1203
     var formAction = (possibleClickedButton && possibleClickedButton.getAttribute('formAction'))
-		? possibleClickedButton.getAttribute('formAction')
-		: form.getAttribute('action');
+        ? possibleClickedButton.getAttribute('formAction')
+        : form.getAttribute('action');
     var formMethod = form.getAttribute('method') || 'GET';
 
     var request = new XMLHttpRequest();
@@ -211,11 +186,11 @@ window.submitForm = function (form, possibleClickedButton) {
             );
             transitionToNewPage(request.response);
             Turbolinks.clearCache();
-            if (urlPathnameWithQuery !== formAction) {
+
+            if (urlPathnameWithQuery !== formAction || urlPathnameWithQuery !== responseUrlPath) {
                 history.pushState({ turbolinks: true }, '', request.responseURL);
-            } else if (urlPathnameWithQuery !== responseUrlPath) {
-                history.replaceState({}, "", request.responseURL)
-            };
+            }
+
             var turbolinkLoadEvent = new CustomEvent('turbolinks:load');
             document.dispatchEvent(turbolinkLoadEvent);
         } else {