diff --git a/includes/admin.inc b/includes/admin.inc
index ca246f4..5d796e8 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -1316,6 +1316,34 @@ function views_ui_edit_form_submit_undo_delete_display($form, &$form_state) {
 }
 
 /**
+ * Submit handler to enable a disabled display.
+ */
+function views_ui_edit_form_submit_enable_display($form, &$form_state) {
+  $id = $form_state['display_id'];
+  $form_state['view']->display[$id]->handler->options['enabled'] = TRUE;
+
+  // Store in cache
+  views_ui_cache_set($form_state['view']);
+
+  // Redirect to the top-level edit page.
+  $form_state['redirect'] = 'admin/structure/views/view/' . $form_state['view']->name . '/edit/' . $id;
+}
+
+/**
+ * Submit handler to disable display.
+ */
+function views_ui_edit_form_submit_disable_display($form, &$form_state) {
+  $id = $form_state['display_id'];
+  $form_state['view']->display[$id]->handler->options['enabled'] = FALSE;
+
+  // Store in cache
+  views_ui_cache_set($form_state['view']);
+
+  // Redirect to the top-level edit page.
+  $form_state['redirect'] = 'admin/structure/views/view/' . $form_state['view']->name . '/edit/' . $id;
+}
+
+/**
  * Submit handler when Preview button is clicked.
  */
 function views_ui_edit_form_submit_preview($form, &$form_state) {
@@ -1447,6 +1475,9 @@ function views_ui_get_display_tab_details($view, $display) {
   $isDeletable = empty($plugin['no remove']);
   // The master display cannot be cloned.
   $isDefault = $display->id == 'default';
+  // @todo: Figure out why get_option doesn't work here.
+  $isEnabled = $display->handler->options['enabled'];
+  dvm($display->handler->options['enabled']);
 
   if (!$isDisplayDeleted && $isDeletable && !$isDefault) {
     $prefix = '<div class="ctools-button ctools-dropbutton"><div class="ctools-link"><a href="#" class="ctools-twisty ctools-text">open</a></div><div class="ctools-content"><ul class="horizontal right actions">';
@@ -1491,6 +1522,26 @@ function views_ui_get_display_tab_details($view, $display) {
           "#suffix" => '</' . $itemElement . '>',
         );
       }
+      if ($isEnabled) {
+        $build['top']['actions']['disable'] = array(
+          '#type' => 'submit',
+          '#value' => t('disable @display_title', array('@display_title' => $display_title)),
+          '#limit_validation_errors' => array(),
+          '#submit' => array('views_ui_edit_form_submit_disable_display', 'views_ui_edit_form_submit_delay_destination'),
+          '#prefix' => '<' . $itemElement . ' class="disable">',
+          "#suffix" => '</' . $itemElement . '>',
+        );
+      }
+      else {
+        $build['top']['actions']['enable'] = array(
+          '#type' => 'submit',
+          '#value' => t('enable @display_title', array('@display_title' => $display_title)),
+          '#limit_validation_errors' => array(),
+          '#submit' => array('views_ui_edit_form_submit_enable_display', 'views_ui_edit_form_submit_delay_destination'),
+          '#prefix' => '<' . $itemElement . ' class="enable">',
+          "#suffix" => '</' . $itemElement . '>',
+        );
+      }
     }
     else {
       $build['top']['actions']['undo_delete'] = array(
diff --git a/plugins/views_plugin_display.inc b/plugins/views_plugin_display.inc
index e83078d..2c5d4d9 100644
--- a/plugins/views_plugin_display.inc
+++ b/plugins/views_plugin_display.inc
@@ -944,13 +944,6 @@ class views_plugin_display extends views_plugin {
       'desc' => t('Change the title that this display will use.'),
     );
 
-    $options['enabled'] = array(
-      'category' => 'other',
-      'title' => t('Display status'),
-      'value' => $this->get_option('enabled') ? t('Enabled') : t('Disabled'),
-      'desc' => t('Define if this display is or is not enabled.'),
-    );
-
     $style_plugin = views_fetch_plugin_data('style', $this->get_option('style_plugin'));
     $style_plugin_instance = $this->get_plugin('style');
     $style_summary = empty($style_plugin['title']) ? t('Missing style plugin') : $style_plugin_instance->summary_title();
@@ -1236,15 +1229,6 @@ class views_plugin_display extends views_plugin {
           '#default_value' => $this->get_option('title'),
         );
         break;
-      case 'enabled':
-        $form['#title'] .= t('Status of this display');
-        $form['enabled'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Enable display'),
-          '#description' => t('If unchecked, this display will not be available in the site.'),
-          '#default_value' => $this->get_option('enabled'),
-        );
-        break;
       case 'css_class':
         $form['#title'] .= t('CSS class');
         $form['css_class'] = array(
@@ -2013,7 +1997,6 @@ class views_plugin_display extends views_plugin {
       case 'display_comment':
         $this->set_option($section, $form_state['values'][$section]);
         break;
-      case 'enabled':
       case 'use_ajax':
       case 'hide_attachment_summary':
         $this->set_option($section, (bool)$form_state['values'][$section]);