diff --git a/Resources/views/Report/edit.html.twig b/Resources/views/Report/edit.html.twig
index 26b5288a1..beafc4093 100644
--- a/Resources/views/Report/edit.html.twig
+++ b/Resources/views/Report/edit.html.twig
@@ -29,23 +29,10 @@
             <button class="sc-button red margin-10" type="reset"><i class="fa fa-eraser"></i> {{ 'Reset report'|trans }}</button>
         </div>
     {{ form_end(edit_form) }}
-    
-<script type="text/javascript">
-var form = $("form[name='{{ edit_form.vars.form.vars.name }}']").data('serialize',$("form[name='{{ edit_form.vars.form.vars.name }}']").serialize());
-// On load save form current state
-var submittedOk{{ edit_form.vars.form.vars.name }} = false;
-form.bind('submit', function(e) {
-    submittedOk{{ edit_form.vars.form.vars.name }} = true;
-});
+{% endblock %}
 
-$(window).bind('beforeunload', function(e){
-    if($("form[name='{{ edit_form.vars.form.vars.name }}']").serialize()!=$("form[name='{{ edit_form.vars.form.vars.name }}']").data('serialize')){
-        if (submittedOk{{ edit_form.vars.form.vars.name }} == false) {
-            return "{{ 'You are going to leave a page with unsubmitted data. Are you sure you want to leave ?'|trans }}";
-            }
-        }
-    e=null;
-    // i.e; if form state change show box not.
-});
+{% block js %}
+<script type="text/javascript">
+    chill.protectUnsavedDataForFrom('form[name="{{ edit_form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
 </script>
 {% endblock %}
diff --git a/Resources/views/Report/new.html.twig b/Resources/views/Report/new.html.twig
index fbfed9830..45080a5f0 100644
--- a/Resources/views/Report/new.html.twig
+++ b/Resources/views/Report/new.html.twig
@@ -29,22 +29,10 @@
             <button class="sc-button red margin-10" type="reset"><i class="fa fa-eraser"></i> {{ 'Reset report'|trans }}</button>
         </div>
     {{ form_end(form) }}
- <script type="text/javascript">
-var form = $("form[name='{{ form.vars.form.vars.name }}']").data('serialize',$("form[name='{{ form.vars.form.vars.name }}']").serialize());
-// On load save form current state
-var submittedOk{{ form.vars.form.vars.name }} = false;
-form.bind('submit', function(e) {
-    submittedOk{{ form.vars.form.vars.name }} = true;
-});
+{% endblock %}
 
-$(window).bind('beforeunload', function(e){
-    if($("form[name='{{ form.vars.form.vars.name }}']").serialize()!=$("form[name='{{ form.vars.form.vars.name }}']").data('serialize')){
-        if (submittedOk{{ form.vars.form.vars.name }} == false) {
-            return "{{ 'You are going to leave a page with unsubmitted data. Are you sure you want to leave ?'|trans }}";
-            }
-        }
-    e=null;
-    // i.e; if form state change show box not.
-});
+{% block js %}
+<script type="text/javascript">
+    chill.protectUnsavedDataForFrom('form[name="{{ form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
 </script>
 {% endblock %}
\ No newline at end of file