diff --git a/ChangeLog b/ChangeLog
index 1af92a2c4f..2e6c142a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ phpMyAdmin - ChangeLog
 - bug #4754 pMA DB not detected properly
 - bug #4825 Datepicker missing when changing number of rows on Insert page
 - bug #4824 INNODB STATUS page is empty
+- bug #4828 JavaScript is loaded in wrong order
 
 4.4.0.0 (2015-04-01)
 + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time
diff --git a/js/transformations/json.js b/js/transformations/json.js
index d2cd111ee3..98c4b33c40 100644
--- a/js/transformations/json.js
+++ b/js/transformations/json.js
@@ -3,18 +3,16 @@
  * JSON syntax highlighting transformation plugin
  */
 AJAX.registerOnload('transformations/json.js', function() {
-	var $elm = $('#page_content').find('code.json');
-	$elm.each(function () {
+    var $elm = $('#page_content').find('code.json');
+    $elm.each(function () {
         var $json = $(this);
         var $pre = $json.find('pre');
         /* We only care about visible elements to avoid double processing */
         if ($pre.is(":visible")) {
             var $highlight = $('<div class="json-highlight cm-s-default"></div>');
             $json.append($highlight);
-            if (typeof CodeMirror != 'undefined') {
-                CodeMirror.runMode($json.text(), 'application/json', $highlight[0]);
-                $pre.hide();
-            }
+            CodeMirror.runMode($json.text(), 'application/json', $highlight[0]);
+            $pre.hide();
         }
     });
 });
\ No newline at end of file
diff --git a/js/transformations/xml.js b/js/transformations/xml.js
index c6ed64b1f1..dd4eef6602 100644
--- a/js/transformations/xml.js
+++ b/js/transformations/xml.js
@@ -3,7 +3,7 @@
  * XML syntax highlighting transformation plugin
  */
 AJAX.registerOnload('transformations/xml.js', function() {
-	var $elm = $('#page_content').find('code.xml');
+    var $elm = $('#page_content').find('code.xml');
     $elm.each(function () {
         var $json = $(this);
         var $pre = $json.find('pre');
@@ -11,10 +11,8 @@ AJAX.registerOnload('transformations/xml.js', function() {
         if ($pre.is(":visible")) {
             var $highlight = $('<div class="xml-highlight cm-s-default"></div>');
             $json.append($highlight);
-            if (typeof CodeMirror != 'undefined') {
-                CodeMirror.runMode($json.text(), 'application/xml', $highlight[0]);
-                $pre.hide();
-            }
+            CodeMirror.runMode($json.text(), 'application/xml', $highlight[0]);
+            $pre.hide();
         }
     });
 });
diff --git a/libraries/Console.class.php b/libraries/Console.class.php
index a8efb9f03e..db9d66341f 100644
--- a/libraries/Console.class.php
+++ b/libraries/Console.class.php
@@ -20,13 +20,6 @@ require_once 'libraries/bookmark.lib.php';
  */
 class PMA_Console
 {
-    /**
-     * PMA_Scripts instance
-     *
-     * @access private
-     * @var PMA_Scripts
-     */
-    private $_scripts;
     /**
      * Whether to display anything
      *
@@ -41,7 +34,6 @@ class PMA_Console
     public function __construct()
     {
         $this->_isEnabled = true;
-        $this->_scripts   = new PMA_Scripts();
     }
 
     /**
@@ -147,6 +139,16 @@ class PMA_Console
         return $output;
     }
 
+    /**
+     * Returns the list of JS scripts required by console
+     *
+     * @return array list of scripts
+     */
+    public function getScripts()
+    {
+        return array('console.js');
+    }
+
     /**
      * Renders the console
      *
@@ -158,15 +160,6 @@ class PMA_Console
         $output  = '';
         if ((! $this->_isAjax) && $this->_isEnabled) {
             $cfgBookmark = PMA_Bookmark_getParams();
-            if ($GLOBALS['cfg']['CodemirrorEnable']) {
-                $this->_scripts->addFile('codemirror/lib/codemirror.js');
-                $this->_scripts->addFile('codemirror/mode/sql/sql.js');
-                $this->_scripts->addFile('codemirror/addon/runmode/runmode.js');
-                $this->_scripts->addFile('codemirror/addon/hint/show-hint.js');
-                $this->_scripts->addFile('codemirror/addon/hint/sql-hint.js');
-            }
-            $this->_scripts->addFile('console.js');
-            $output .= $this->_scripts->getDisplay();
             $output .= '<div id="pma_console_container"><div id="pma_console">';
 
             // The templates, use sprintf() to output them
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
index e5f37fe211..4e761fa7b2 100644
--- a/libraries/Header.class.php
+++ b/libraries/Header.class.php
@@ -406,6 +406,7 @@ class PMA_Header
                 }
                 $this->_scripts->addCode('ConsoleEnterExecutes='
                     . ($GLOBALS['cfg']['ConsoleEnterExecutes'] ? 'true' : 'false'));
+                $this->_scripts->addFiles($this->_console->getScripts());
                 if ($this->_userprefsOfferImport) {
                     $this->_scripts->addFile('config.js');
                 }
diff --git a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php b/libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php
index 4db3142794..1af1330bea 100644
--- a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php
+++ b/libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php
@@ -42,10 +42,13 @@ class Text_Plain_JsonEditor extends CodeMirrorEditorTransformationsPlugin
      */
     public function getScripts()
     {
-        return array(
-            'codemirror/mode/javascript/javascript.js',
-            'transformations/json_editor.js'
-        );
+        $scripts = array();
+        if ($GLOBALS['cfg']['CodemirrorEnable']) {
+            $scripts[] = 'codemirror/lib/codemirror.js';
+            $scripts[] = 'codemirror/mode/javascript/javascript.js';
+            $scripts[] = 'transformations/json_editor.js';
+        }
+        return $scripts;
     }
 
     /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
diff --git a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php b/libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php
index d7f805e453..61146b053d 100644
--- a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php
+++ b/libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php
@@ -42,9 +42,13 @@ class Text_Plain_SqlEditor extends CodeMirrorEditorTransformationsPlugin
      */
     public function getScripts()
     {
-        return array(
-            'transformations/sql_editor.js'
-        );
+        $scripts = array();
+        if ($GLOBALS['cfg']['CodemirrorEnable']) {
+            $scripts[] = 'codemirror/lib/codemirror.js';
+            $scripts[] = 'codemirror/mode/sql/sql.js';
+            $scripts[] = 'transformations/sql_editor.js';
+        }
+        return $scripts;
     }
 
     /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
diff --git a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php b/libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php
index 6790c57fef..e203ef5d13 100644
--- a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php
+++ b/libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php
@@ -42,10 +42,13 @@ class Text_Plain_XmlEditor extends CodeMirrorEditorTransformationsPlugin
      */
     public function getScripts()
     {
-        return array(
-            'codemirror/mode/xml/xml.js',
-            'transformations/xml_editor.js'
-        );
+        $scripts = array();
+        if ($GLOBALS['cfg']['CodemirrorEnable']) {
+            $scripts[] = 'codemirror/lib/codemirror.js';
+            $scripts[] = 'codemirror/mode/xml/xml.js';
+            $scripts[] = 'transformations/xml_editor.js';
+        }
+        return $scripts;
     }
 
     /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
diff --git a/libraries/plugins/transformations/output/Text_Plain_Json.class.php b/libraries/plugins/transformations/output/Text_Plain_Json.class.php
index 52c0214a37..621cd1903e 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Json.class.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Json.class.php
@@ -23,10 +23,14 @@ class Text_Plain_Json extends TransformationsPlugin
 {
     public function __construct()
     {
-        $response = PMA_Response::getInstance();
-        $scripts = $response->getHeader()->getScripts();
-        $scripts->addFile('codemirror/mode/javascript/javascript.js');
-        $scripts->addFile('transformations/json.js');
+        if (! empty($GLOBALS['cfg']['CodemirrorEnable'])) {
+            $response = PMA_Response::getInstance();
+            $scripts = $response->getHeader()->getScripts();
+            $scripts->addFile('codemirror/lib/codemirror.js');
+            $scripts->addFile('codemirror/mode/javascript/javascript.js');
+            $scripts->addFile('codemirror/addon/runmode/runmode.js');
+            $scripts->addFile('transformations/json.js');
+        }
     }
 
     /**
diff --git a/libraries/plugins/transformations/output/Text_Plain_Sql.class.php b/libraries/plugins/transformations/output/Text_Plain_Sql.class.php
index 5c137236a8..472acf39f0 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Sql.class.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Sql.class.php
@@ -22,6 +22,18 @@ require_once 'libraries/plugins/transformations/abstract/'
  */
 class Text_Plain_Sql extends SQLTransformationsPlugin
 {
+    public function __construct()
+    {
+        if (! empty($GLOBALS['cfg']['CodemirrorEnable'])) {
+            $response = PMA_Response::getInstance();
+            $scripts = $response->getHeader()->getScripts();
+            $scripts->addFile('codemirror/lib/codemirror.js');
+            $scripts->addFile('codemirror/mode/sql/sql.js');
+            $scripts->addFile('codemirror/addon/runmode/runmode.js');
+            $scripts->addFile('function.js');
+        }
+    }
+
     /**
      * Gets the plugin`s MIME type
      *
diff --git a/libraries/plugins/transformations/output/Text_Plain_Xml.class.php b/libraries/plugins/transformations/output/Text_Plain_Xml.class.php
index d5777aa9d1..d41880d44b 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Xml.class.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Xml.class.php
@@ -23,10 +23,14 @@ class Text_Plain_Xml extends TransformationsPlugin
 {
     public function __construct()
     {
-        $response = PMA_Response::getInstance();
-        $scripts = $response->getHeader()->getScripts();
-        $scripts->addFile('codemirror/mode/xml/xml.js');
-        $scripts->addFile('transformations/xml.js');
+        if (! empty($GLOBALS['cfg']['CodemirrorEnable'])) {
+            $response = PMA_Response::getInstance();
+            $scripts = $response->getHeader()->getScripts();
+            $scripts->addFile('codemirror/lib/codemirror.js');
+            $scripts->addFile('codemirror/mode/xml/xml.js');
+            $scripts->addFile('codemirror/addon/runmode/runmode.js');
+            $scripts->addFile('transformations/xml.js');
+        }
     }
 
     /**