diff --git a/core/modules/views/views_ui/js/views-admin.js b/core/modules/views/views_ui/js/views-admin.js
index c6f380d..20e6ebf 100644
--- a/core/modules/views/views_ui/js/views-admin.js
+++ b/core/modules/views/views_ui/js/views-admin.js
@@ -1096,6 +1096,30 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
 
 };
 
+Drupal.behaviors.handlerRemoveLink = {};
+Drupal.behaviors.handlerRemoveLink.attach = function(context) {
+  jQuery('a.views-remove-link', context).once('views-processed').click(function(event) {
+    var id = jQuery(this).attr('id').replace('views-remove-link-', '');
+    jQuery('#views-row-' + id).hide();
+    jQuery('#views-removed-' + id).attr('checked', true);
+    event.preventDefault();
+  });
+
+  /**
+   * Here is to handle display deletion
+   * (checking in the hidden checkbox and hiding out the row)
+   */
+  jQuery('a.display-remove-link', context)
+    .addClass('display-processed')
+    .click(function() {
+      var id = jQuery(this).attr('id').replace('display-remove-link-', '');
+      jQuery('#display-row-' + id, context).hide();
+      jQuery('#display-removed-' + id, context).attr('checked', true);
+      return false;
+  });
+
+};
+
 jQuery(function() {
 
   "use strict"
diff --git a/core/modules/views/views_ui/views_ui.theme.inc b/core/modules/views/views_ui/views_ui.theme.inc
index 176955f..c0194bc 100644
--- a/core/modules/views/views_ui/views_ui.theme.inc
+++ b/core/modules/views/views_ui/views_ui.theme.inc
@@ -255,7 +255,7 @@ function theme_views_ui_rearrange_form($variables) {
       $row[] = drupal_render($form['fields'][$id]['name']);
       $form['fields'][$id]['weight']['#attributes']['class'] = array('weight');
       $row[] = drupal_render($form['fields'][$id]['weight']);
-      $row[] = drupal_render($form['fields'][$id]['removed']) . l('<span>' . t('Remove') . '</span>', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => array('views-hidden', 'views-button-remove', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => TRUE));
+      $row[] = drupal_render($form['fields'][$id]['removed']) . l('<span>' . t('Remove') . '</span>', '', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => array('js-only', 'views-button-remove', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => TRUE));
       $rows[] = array('data' => $row, 'class' => array('draggable'), 'id' => 'views-row-' . $id);
     }
   }
@@ -321,7 +321,7 @@ function theme_views_ui_rearrange_filter_form(&$vars) {
         $form['filters'][$id]['group']['#attributes']['class'] = array('views-group-select views-group-select-' . $group_id);
         $row[] = drupal_render($form['filters'][$id]['group']);
         $form['filters'][$id]['removed']['#attributes']['class'][] = 'js-hide';
-        $row[] = drupal_render($form['filters'][$id]['removed']) . l('<span>' . t('Remove') . '</span>', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => array('views-hidden', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => TRUE));
+        $row[] = drupal_render($form['filters'][$id]['removed']) . l('<span>' . t('Remove') . '</span>', '', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => array('js-only', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => TRUE));
 
         $row = array('data' => $row, 'class' => array('draggable'), 'id' => 'views-row-' . $id);
         if ($group_id !== 'ungroupable') {