diff --git a/includes/admin.inc b/includes/admin.inc
index 13fd351..d44f84d 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -2509,6 +2509,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);
   }
@@ -2518,6 +2519,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);
   }
@@ -2533,11 +2535,11 @@ function views_ui_standard_submit($form, &$form_state) {
  */
 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'])) {
+  if (isset($form_state['input']['override']['dropdown'])) {
     // #default_value is used to determine whether it was the default value or not.
     // So the available options are: $display, 'default' and 'default_revert', not 'defaults'.
     $was_defaulted = ($form['override']['dropdown']['#default_value'] === 'defaults');
-    $is_defaulted = ($form_state['values']['override']['dropdown'] === 'default');
+    $is_defaulted = ($form_state['input']['override']['dropdown'] === 'default');
     $revert = ($form_state['values']['override']['dropdown'] === 'default_revert');
 
     if ($was_defaulted !== $is_defaulted && isset($form['#section'])) {
@@ -4362,6 +4364,12 @@ 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