diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index f2e4000499b..111e8b0e086 100644
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -228,14 +228,8 @@
     // print_box_end();
   
     if ($typ!='label') {
-        echo <<<EOD
-        <script language="javascript">
-        var item = document.getElementById("id_itemname");
-        if(item){
-            item.focus();
-        }
-        </script>
-EOD;
+        $PAGE->requires->js('mod/feedback/feedback.js');
+        $PAGE->requires->js_function_call('set_item_focus', Array('id_itemname'));
     } 
 
     /// Finish the page
diff --git a/mod/feedback/feedback.js b/mod/feedback/feedback.js
new file mode 100644
index 00000000000..2bb1b6d3f08
--- /dev/null
+++ b/mod/feedback/feedback.js
@@ -0,0 +1,11 @@
+function set_item_focus(itemid) {
+    var item = document.getElementById(itemid);
+    if(item){
+        item.focus();
+    }
+}
+
+function feedbackGo2delete(form) {
+    form.action = moodle_cfg.wwwroot+'/mod/feedback/delete_completed.php';
+    form.submit();
+}
\ No newline at end of file
diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index 228db2ec01f..0837d964519 100644
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -84,15 +84,8 @@
     //print the list with anonymous completeds
     // print_simple_box_start("center");
     print_box_start('generalbox boxaligncenter boxwidthwide');
+    $PAGE->requires->js('mod/feedback/feedback.js');
 ?>
-    <script type="text/javascript">
-        function feedbackGo2delete(form)
-        {
-            form.action = "<?php echo $CFG->wwwroot;?>/mod/feedback/delete_completed.php";
-            form.submit();
-        }
-    </script>
-
     <div class="mdl-align">
     <form name="frm" action="<?php echo me();?>" method="post">
         <table>