diff --git a/includes/admin.inc b/includes/admin.inc
index d62da47..d2737cd 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -2450,30 +2450,8 @@ function views_ui_standard_submit($form, &$form_state) {
   // Determine whether the values the user entered are intended to apply to
   // the current display or the default display.
 
-  // Make sure the dropdown exists in the first place.
-  if (isset($form_state['values']['override']['dropdown'])) {
-    // #default_value is used to determine whether it was the default value or not.
-    // So the availible options are: $display and 'default', not 'defaults'.
-    $was_defaulted = (bool) ($form['override']['dropdown']['#default_value'] === 'defaults');
-    $is_defaulted = (bool) ($form_state['values']['override']['dropdown'] === 'default');
-
-    if ($was_defaulted !== $is_defaulted && isset($form['#section'])) {
-      // We're changing which display these values apply to.
-      // Update the #section so it knows what to mark changed.
-      $form['#section'] = str_replace('default-', $form_state['display_id'] . '-', $form['#section']);
-    }
-  }
-  else {
-    // The user didn't get the dropdown for overriding the default display.
-    $was_defaulted = FALSE;
-    $is_defaulted = FALSE;
-  }
 
-  // Mark the changed section of the view as changed.
-  // TODO: Document why we are doing this, and see if we still need it.
-  if (!empty($form['#section'])) {
-    $form_state['view']->changed_sections[$form['#section']] = TRUE;
-  }
+  list($was_defaulted, $is_defaulted) = views_ui_standard_override_values($form, $form_state);
 
   // Based on the user's choice in the display dropdown, determine which display
   // these changes apply to.
@@ -2485,6 +2463,7 @@ function views_ui_standard_submit($form, &$form_state) {
     // We were using the default display's values, but we're now overriding
     // the default display and saving values specific to this display.
     $display = &$form_state['view']->display[$form_state['display_id']];
+    // options_override toggles the override of this section.
     $display->handler->options_override($form, $form_state);
     $display->handler->options_submit($form, $form_state);
   }
@@ -2494,6 +2473,7 @@ function views_ui_standard_submit($form, &$form_state) {
     // Overwrite the default display with the current form values, and make
     // the current display use the new default values.
     $display = &$form_state['view']->display[$form_state['display_id']];
+    // options_override toggles the override of this section.
     $display->handler->options_override($form, $form_state);
     $display->handler->options_submit($form, $form_state);
   }
@@ -2505,6 +2485,37 @@ function views_ui_standard_submit($form, &$form_state) {
 }
 
 /**
+ * Return the was_defaulted and is_defaulted state of a form.
+ */
+function views_ui_standard_override_values($form, $form_state) {
+  // Make sure the dropdown exists in the first place.
+  if (isset($form_state['values']['override']['dropdown'])) {
+    // #default_value is used to determine whether it was the default value or not.
+    // So the availible options are: $display and 'default', not 'defaults'.
+    $was_defaulted = (bool) ($form['override']['dropdown']['#default_value'] === 'defaults');
+    $is_defaulted = (bool) ($form_state['values']['override']['dropdown'] === 'default');
+
+    if ($was_defaulted !== $is_defaulted && isset($form['#section'])) {
+      // We're changing which display these values apply to.
+      // Update the #section so it knows what to mark changed.
+      $form['#section'] = str_replace('default-', $form_state['display_id'] . '-', $form['#section']);
+    }
+  }
+  else {
+    // The user didn't get the dropdown for overriding the default display.
+    $was_defaulted = FALSE;
+    $is_defaulted = FALSE;
+  }
+
+  // Mark the changed section of the view as changed.
+  // TODO: Document why we are doing this, and see if we still need it.
+  if (!empty($form['#section'])) {
+    $form_state['view']->changed_sections[$form['#section']] = TRUE;
+  }
+  return array($was_defaulted, $is_defaulted);
+}
+
+/**
  * Submit handler for cancel button
  */
 function views_ui_standard_cancel($form, &$form_state) {
@@ -4305,6 +4316,13 @@ function views_ui_config_item_group_form_submit($form, &$form_state) {
  */
 function views_ui_config_item_form_remove($form, &$form_state) {
   // Store the item back on the view
+  list($was_defaulted, $is_defaulted) = views_ui_standard_override_values($form, $form_state);
+  // If the display selection was changed toggle the override value.
+  if ($was_defaulted != $is_defaulted) {
+    $display = &$form_state['view']->display[$form_state['display_id']];
+    $display->handler->options_override($form, $form_state);
+  }
+
   $form_state['view']->set_item($form_state['display_id'], $form_state['type'], $form_state['id'], NULL);
 
   // Write to cache