diff --git a/docroot/sites/all/modules/contrib/menuperformance/menuperformance.js b/docroot/sites/all/modules/contrib/menuperformance/menuperformance.js
index 2255530..ebb4f9d 100644
--- a/docroot/sites/all/modules/contrib/menuperformance/menuperformance.js
+++ b/docroot/sites/all/modules/contrib/menuperformance/menuperformance.js
@@ -1,3 +1,9 @@
+// Sort function for weight-based sorting
+function dynamicSort(property) {
+    return function (a, b) {
+        return (a[property] > b[property]) ? -1 : (a[property] < b[property]) ? 1 : 0;
+    }
+}
 (function ($) {
   Drupal.behaviors.menuperformance = {
     attach: function (context, settings) {
@@ -23,9 +29,17 @@
               // Add data about the select element's index
               $('#edit-menu-menuperformance-node-menu-parent-link-0').data('mpi', '0');
               $('#edit-menu-menuperformance-node-menu-parent-link-0').append('<option value="0">[select]</option>');
-              for (var key in data) {
-                if (data.hasOwnProperty(key)) {
-                  var obj = data[key];
+
+              var optionObjects = [];
+              for (var options in data) {
+                optionObjects.push({"mlid":data[options].mlid, "link_title":data[options].link_title, "weight":data[options].weight});
+              }
+              optionObjects.sort(dynamicSort("weight"));
+              //@Todo do something to 0 comparison. Every item should have weight
+
+              for (var key in optionObjects) {
+                if (optionObjects.hasOwnProperty(key)) {
+                  var obj = optionObjects[key];
                   if(obj.mlid != Drupal.settings.menuperformance.current_mlid) {
                     $('#edit-menu-menuperformance-node-menu-parent-link-0').append('<option value="' + obj.mlid + '">' + obj.link_title + '</option>');
                   }
@@ -84,9 +98,15 @@
               // Add data about the select element's index
               $('#edit-menu-menuperformance-node-menu-parent-link-' + new_i).data('mpi', new_i);
 
-              for (var key in data) {
-                if (data.hasOwnProperty(key)) {
-                  var obj = data[key];
+                var optionObjects = [];
+                for (var options in data) {
+                    optionObjects.push({"mlid":data[options].mlid, "link_title":data[options].link_title, "weight":data[options].weight});
+                }
+                optionObjects.sort(dynamicSort("weight"));
+
+                for (var key in optionObjects) {
+                if (optionObjects.hasOwnProperty(key)) {
+                  var obj = optionObjects[key];
                   if(obj.mlid != Drupal.settings.menuperformance.current_mlid) {
                     $('#edit-menu-menuperformance-node-menu-parent-link-' + new_i).append('<option value="' + obj.mlid + '">' + obj.link_title + '</option>');
                   }
diff --git a/docroot/sites/all/modules/contrib/menuperformance/menuperformance.module b/docroot/sites/all/modules/contrib/menuperformance/menuperformance.module
index 656e2c9..ee83419 100644
--- a/docroot/sites/all/modules/contrib/menuperformance/menuperformance.module
+++ b/docroot/sites/all/modules/contrib/menuperformance/menuperformance.module
@@ -418,9 +418,10 @@ function menuperformance_ajax($menu_name, $mlid) {
  */
 function menuperformance_get_link_children($menu_name, $mlid, $simple = FALSE) {
   $query = db_select('menu_links')
-  ->fields('menu_links', array('link_title', 'mlid'))
+  ->fields('menu_links', array('link_title', 'mlid', 'weight'))
   ->condition('plid', $mlid)
-  ->condition('menu_name', $menu_name);
+  ->condition('menu_name', $menu_name)
+  ->orderBy('weight', 'ASC');
 
   $result = $query->execute();
 
