diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index 761185e..b764ca5 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -483,18 +483,18 @@
      *   An array of all the filterable options.
      */
     getOptions: function ($allOptions) {
-      var $label;
+      var $title;
       var $description;
       var $option;
       var options = [];
       var length = $allOptions.length;
       for (var i = 0; i < length; i++) {
         $option = $($allOptions[i]);
-        $label = $option.find('label');
+        $title = $option.find('.title');
         $description = $option.find('.description');
         options[i] = {
-          // Search on the lowercase version of the label text + description.
-          searchText: $label.text().toLowerCase() + ' ' + $description.text().toLowerCase(),
+          // Search on the lowercase version of the title text + description.
+          searchText: $title.text().toLowerCase() + ' ' + $description.text().toLowerCase(),
           // Maintain a reference to the jQuery object for each row, so we don't
           // have to create a new object inside the performance-sensitive keyup
           // handler.
diff --git a/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
index ada0ccd..30a1aa2 100644
--- a/core/modules/views_ui/src/Form/Ajax/AddHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
@@ -154,6 +154,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
             ),
           );
         }
+        uasort($form['options']['name']['#options'], [$this, 'sortByTitle']);
       }
 
       $form['override']['controls']['group']['#options'] = $groups;
@@ -184,4 +185,22 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     return $form;
   }
 
+  /**
+   * Sort the handlers table based on the title by string size.
+   *
+   * @param  array $a
+   *   One row data to compare.
+   * @param  array $b
+   *   One row data to compare.
+   * @return boolean
+   *   True if the title of the first row is longer than the second one.
+   */
+  protected function sortByTitle($a, $b) {
+    // By sorting by string lenght strings like ID, type or title are
+    // prioritized before strings like "Comment ID" or "Entity Type"
+
+    return strlen((string) $a['title']['data']['#title']) >
+           strlen((string) $b['title']['data']['#title']);
+  }
+
 }