Index: plugins/views_plugin_display.inc
===================================================================
--- plugins/views_plugin_display.inc	(revision 240)
+++ plugins/views_plugin_display.inc	(working copy)
@@ -470,6 +470,23 @@
    * @return
    *   TRUE for the default display
    */
+  function is_defaulted_group($option) {
+    $defaultable_sections = $this->defaultable_sections();
+    if(isset($defaultable_sections[$option])) {
+      $defaulted = TRUE;
+      foreach($defaultable_sections[$option] as $value) {
+        if(!$this->is_defaulted($value)) {
+          $defaulted = FALSE;
+          break;
+        }
+      }
+      return $defaulted;
+    }
+    else {
+      return $this->is_defaulted($option);
+    }
+  }
+  
   function is_defaulted($option) {
     return !$this->is_default_display() && !empty($this->default_display) && !empty($this->options['defaults'][$option]);
   }
Index: includes/view.inc
===================================================================
--- includes/view.inc	(revision 240)
+++ includes/view.inc	(working copy)
@@ -1479,22 +1479,67 @@
             // skip these
             break;
           default:
-            if (!$display->handler->is_defaulted($option)) {
-              $value = $display->handler->get_option($option);
-              if ($id == 'default') {
-                $default = isset($definition['default']) ? $definition['default'] : NULL;
+            // Check all options in this $option's section for overridden values
+            if (!$display->handler->is_defaulted_group($option)) {
+              $defaultable_sections = $display->handler->defaultable_sections();
+              $key = '';
+              
+              // Find the $key for the appropriate section that this $option belongs
+              // to so we can check all members of the section
+              if(isset($defaultable_sections[$option])) {
+                $key = $option;
               }
               else {
-                $default = $this->display['default']->handler->get_option($option);
+                foreach($defaultable_sections as $section => $members) {
+                  if(in_array($option, $members)) {
+                    $key = $section;
+                  }
+                }
               }
+              
+              $defaulted = TRUE;
+              // If $option is standalone, i.e., not one of the sections, only check $option
+              // against the defaults
+              if($key == '') {
+                $value = $display->handler->get_option($option);
+                if ($id == 'default') {
+                  $default = isset($definition['default']) ? $definition['default'] : NULL;
+                }
+                else {
+                  $default = $this->display['default']->handler->get_option($option);
+                }
 
-              if ($value !== $default) {
-                $output .= $indent . '$handler->override_option(\'' . $option . '\', ' . views_var_export($value, $indent) . ");\n";
+                if ($value !== $default) {
+                  $defaulted = FALSE;
+                }
               }
+              // If $option is in one of the defaultable_sections, all section members
+              // need to be checked against the defaults
+              else {
+                foreach($defaultable_sections[$key] as $var) {
+                  $value = $display->handler->get_option($var);
+                  if ($id == 'default') {
+                    $default = isset($definition['default']) ? $definition['default'] : NULL;
+                  }
+                  else {
+                    $default = $this->display['default']->handler->get_option($var);
+                  }
+                  if ($value !== $default) {
+                    $defaulted = FALSE;
+                    break;
+                  }
+                }
+              }
+              
+              // Generate override code if we've determined that it (or one of its section-mates) has been overridden in the view
+              if(!$defaulted) {
+                  $value = $display->handler->get_option($option);
+                  $output .= $indent . '$handler->override_option(\'' . $option . '\', ' . views_var_export($value, $indent) . ");\n";
+              }
             }
+          }
         }
       }
-    }
 
     return $output;
   }