diff --git a/js/export.js b/js/export.js
index b999d82c1a..f472c25ec8 100644
--- a/js/export.js
+++ b/js/export.js
@@ -1042,4 +1042,14 @@ AJAX.registerOnload('export.js', function () {
         e.preventDefault();
         setSelectOptions(false);
     });
+
+    $('#buttonGo').on('click', function () {
+        var timeLimit = parseInt($(this).attr('data-exec-time-limit'));
+
+        // If the time limit set is zero,
+        // then time out won't occur so no need to check for time out.
+        if (timeLimit > 0) {
+            Export.checkTimeOut(timeLimit);
+        }
+    });
 });
diff --git a/js/export_output.js b/js/export_output.js
index 5a0fa10b42..dd87d448ca 100644
--- a/js/export_output.js
+++ b/js/export_output.js
@@ -5,4 +5,9 @@ AJAX.registerOnload('export_output.js', function () {
             $('#export_refresh_form').trigger('submit');
         }
     });
+
+    $('#export_refresh_btn').on('click', function (e) {
+        e.preventDefault();
+        $('#export_refresh_form').trigger('submit');
+    });
 });
diff --git a/js/rte.js b/js/rte.js
index 39324c43c7..2563f41295 100644
--- a/js/rte.js
+++ b/js/rte.js
@@ -923,6 +923,11 @@ $(function () {
      */
     $(document).on('click', 'a.ajax.add_anchor, a.ajax.edit_anchor', function (event) {
         event.preventDefault();
+
+        if ($(this).hasClass('add_anchor')) {
+            $.datepicker.initialized = false;
+        }
+
         var type = $(this).attr('href').substr(0, $(this).attr('href').indexOf('&'));
         if (type.indexOf('routine') !== -1) {
             type = 'routine';
diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php
index 1a316b95e5..57f95c60e1 100644
--- a/libraries/classes/Export.php
+++ b/libraries/classes/Export.php
@@ -600,7 +600,7 @@ class Export
         $html .= $back_button;
         $refreshButton = '<form id="export_refresh_form" method="POST" action="'
             . Url::getFromRoute('/export') . '" class="disableAjax">';
-        $refreshButton .= '[ <a class="disableAjax" onclick="$(this).parent().submit()">' . __('Refresh') . '</a> ]';
+        $refreshButton .= '[ <a class="disableAjax" id="export_refresh_btn">' . __('Refresh') . '</a> ]';
         foreach ($_POST as $name => $value) {
             if (is_array($value)) {
                 foreach ($value as $val) {
diff --git a/templates/database/events/index.twig b/templates/database/events/index.twig
index ca2bd955a8..5520ab3c77 100644
--- a/templates/database/events/index.twig
+++ b/templates/database/events/index.twig
@@ -100,7 +100,7 @@
     <legend>{% trans %}New{% context %}Create new event{% endtrans %}</legend>
     <div class="wrap">
       {% if has_privilege %}
-        <a class="ajax add_anchor" href="{{ url('/database/events', {'db': db, 'add_item': true}) }}" onclick="$.datepicker.initialized = false;">
+        <a class="ajax add_anchor" href="{{ url('/database/events', {'db': db, 'add_item': true}) }}">
           {{ get_icon('b_event_add') }}
           {% trans 'Add event' %}
         </a>
diff --git a/templates/database/routines/footer.twig b/templates/database/routines/footer.twig
index 6d16785bf6..9893741096 100644
--- a/templates/database/routines/footer.twig
+++ b/templates/database/routines/footer.twig
@@ -2,7 +2,7 @@
   <legend>{% trans %}New{% context %}Create new routine{% endtrans %}</legend>
   <div class='wrap'>
     {% if has_privilege %}
-      <a class="ajax add_anchor" href="{{ url('/database/routines', {'db': db, 'table': table, 'add_item': true}) }}" onclick="$.datepicker.initialized = false;">
+      <a class="ajax add_anchor" href="{{ url('/database/routines', {'db': db, 'table': table, 'add_item': true}) }}">
         {{ get_icon('b_routine_add') }}
         {% trans 'Add routine' %}
       </a>
diff --git a/templates/database/triggers/footer.twig b/templates/database/triggers/footer.twig
index 7bf17f0fb6..f8fef1b47a 100644
--- a/templates/database/triggers/footer.twig
+++ b/templates/database/triggers/footer.twig
@@ -2,7 +2,7 @@
   <legend>{% trans %}New{% context %}Create new trigger{% endtrans %}</legend>
   <div class='wrap'>
     {% if has_privilege %}
-      <a class="ajax add_anchor" href="{{ url('/database/triggers', {'db': db, 'table': table, 'add_item': true}) }}" onclick="$.datepicker.initialized = false;">
+      <a class="ajax add_anchor" href="{{ url('/database/triggers', {'db': db, 'table': table, 'add_item': true}) }}">
         {{ get_icon('b_trigger_add') }}
         {% trans 'Add trigger' %}
       </a>
diff --git a/templates/export.twig b/templates/export.twig
index 31de124d89..c7ad8efc8a 100644
--- a/templates/export.twig
+++ b/templates/export.twig
@@ -419,8 +419,6 @@
   {% endif %}
 
   <div class="exportoptions justify-content-end" id="submit">
-    <input id="buttonGo" class="btn btn-primary" type="submit" value="{% trans 'Go' %}"
-      {#- If the time limit set is zero, then time out won't occur so no need to check for time out. -#}
-      {%- if exec_time_limit > 0 %} onclick="Export.checkTimeOut({{ exec_time_limit }})"{% endif %}>
+    <input id="buttonGo" class="btn btn-primary" type="submit" value="{% trans 'Go' %}" data-exec-time-limit="{{ exec_time_limit }}">
   </div>
 </form>