<script language="JavaScript">
<!--
function _AN_global_var_init(){
	_AN_this_url = "/prx/000/";
	_AN_base_scheme = "https";
	_AN_base_host = "https://patch-diff.githubusercontent.com";
	_AN_base_path = "https://patch-diff.githubusercontent.com/raw/django-commons/django-debug-toolbar/pull/";
	_AN_encode_urls = 0;
	_AN_mpo = 1;
	_AN_md = 0;
	_AN_rel_urls = 0;
	_AN_nav_switch = 0;
	_AN_nav_allowurl = 1;
	_AN_nav_override = 0;
	_AN_has_iframe = 0;
	_AN_dbg_flags = null;
	_AN_nav_use_aaa = 1;
	_AN_expires_pass = 0;
	_AN_wrap_evthandlers = 0;
	_AN_rewrite_param_exact = 0;
	_AN_obj_params = {};
} 
_AN_global_var_init();
//-->
</script>
<script language="JavaScript" src="/prx/001/http/localh/an_util.js"></script>
<script language="JavaScript" src="/prx/001/http/localh/NSLib.js"></script>

diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js
index 6628a1271..641121aff 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.js
@@ -105,23 +105,19 @@ const djdt = {
         $$.on(djDebug, 'click', '.remoteCall', function(event) {
             event.preventDefault();
 
+            let url;
             const ajax_data = {};
 
             if (this.tagName === 'BUTTON') {
                 const form = this.closest('form');
-                ajax_data.url = this.formAction;
-
-                if (form) {
-                    ajax_data.body = new FormData(form);
-                    ajax_data.method = form.method.toUpperCase();
-                }
-            }
-
-            if (this.tagName === 'A') {
-                ajax_data.url = this.href;
+                url = this.formAction;
+                ajax_data.method = form.method.toUpperCase();
+                ajax_data.body = new FormData(form);
+            } else if (this.tagName === 'A') {
+                url = this.href;
             }
 
-            ajax(ajax_data.url, ajax_data).then(function(data) {
+            ajax(url, ajax_data).then(function(data) {
                 const win = djDebug.querySelector('#djDebugWindow');
                 win.innerHTML = data.content;
                 $$.show(win);
@@ -131,22 +127,19 @@ const djdt = {
         // Used by the history panel
         $$.on(djDebug, 'click', '.switchHistory', function(event) {
             event.preventDefault();
-            const ajax_data = {};
             const newStoreId = this.dataset.storeId;
             const form = this.closest('form');
             const tbody = this.closest('tbody');
 
-            ajax_data.url = this.getAttribute('formaction');
-
-            if (form) {
-                ajax_data.body = new FormData(form);
-                ajax_data.method = form.getAttribute('method') || 'POST';
-            }
+            const ajax_data = {
+                method: form.method.toUpperCase(),
+                body: new FormData(form),
+            };
 
             tbody.querySelector('.djdt-highlighted').classList.remove('djdt-highlighted');
             this.closest('tr').classList.add('djdt-highlighted');
 
-            ajax(ajax_data.url, ajax_data).then(function(data) {
+            ajax(form.action, ajax_data).then(function(data) {
                 djDebug.setAttribute('data-store-id', newStoreId);
                 Object.keys(data).map(function (panelId) {
                     if (djDebug.querySelector('#'+panelId)) {
@@ -160,18 +153,15 @@ const djdt = {
         // Used by the history panel
         $$.on(djDebug, 'click', '.refreshHistory', function(event) {
             event.preventDefault();
-            const ajax_data = {};
             const form = this.closest('form');
             const container = djDebug.querySelector('#djdtHistoryRequests');
 
-            ajax_data.url = this.getAttribute('formaction');
-
-            if (form) {
-                ajax_data.body = new FormData(form);
-                ajax_data.method = form.getAttribute('method') || 'POST';
-            }
+            const ajax_data = {
+                method: form.method.toUpperCase(),
+                body: new FormData(form),
+            };
 
-            ajax(ajax_data.url, ajax_data).then(function(data) {
+            ajax(form.action, ajax_data).then(function(data) {
                 if (data.requests.constructor === Array) {
                     data.requests.map(function(request) {
                         if (!container.querySelector('[data-store-id="'+request.id+'"]')) {
diff --git a/debug_toolbar/templates/debug_toolbar/panels/history.html b/debug_toolbar/templates/debug_toolbar/panels/history.html
index dc404fa65..873c43d73 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/history.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/history.html
@@ -1,7 +1,7 @@
 {% load i18n %}{% load static %}
-<form method="post">
+<form method="post" action="{% url 'djdt:history_refresh' %}">
     {{ refresh_form }}
-    <button formaction="{% url 'djdt:history_refresh' %}" class="refreshHistory">Refresh</button>
+    <button class="refreshHistory">Refresh</button>
 </form>
 <table style="max-height:100%;">
     <thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/history_tr.html b/debug_toolbar/templates/debug_toolbar/panels/history_tr.html
index 8e446a9b6..338e96154 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/history_tr.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/history_tr.html
@@ -39,9 +39,9 @@
         </div>
     </td>
     <td class="djdt-actions">
-        <form method="post">
+        <form method="post" action="{% url 'djdt:history_sidebar' %}">
             {{ store_context.form }}
-            <button formaction="{% url 'djdt:history_sidebar' %}" data-store-id="{{ id }}" class="switchHistory">Switch</button>
+            <button data-store-id="{{ id }}" class="switchHistory">Switch</button>
         </form>
     </td>
 </tr>
