diff --git a/panopoly_magic.module b/panopoly_magic.module
index 00265c4..108d172 100644
--- a/panopoly_magic.module
+++ b/panopoly_magic.module
@@ -722,63 +722,62 @@ function panopoly_magic_form_views_content_views_panes_content_type_edit_form_al
     }
   }
 
-  // Determine if this is a fielded view. If so, add magic display type changer
-  $view_handler = $form_state['view']->display_handler;
-  if ($view_handler->options['row_plugin'] == 'fields') {
-    // Set to default view settings if there isn't one.
-    if (empty($conf['view_settings'])) {
-      if ($form_state['view']->style_plugin->plugin_name == 'table') {
-        $conf['view_settings'] = 'table';
-      }
-      else {
-        $conf['view_settings'] = 'fields';
-      }
+  // Set to default view settings if there isn't one.
+  if (empty($conf['view_settings'])) {
+    if ($form_state['view']->style_plugin->plugin_name == 'table') {
+      $conf['view_settings'] = 'table';
     }
+    else if ($form_state['view']->style_plugin->plugin_name == 'default') {
+      $conf['view_settings'] = 'rendered_entity';
+    }
+    else {
+      $conf['view_settings'] = 'fields';
+    }
+  }
 
-    // Deal with legacy 'nodes' and others (such as 'files') view settings so
-    // that other entity types can be included.
-    $conf['view_settings'] = panopoly_magic_convert_view_settings($conf['view_settings']);
-
-    // Add information about the View Mode
-    $form['display_settings']['view_settings'] = array(
-      '#type' => 'radios',
-      '#prefix' => '<div class="view-settings-wrapper"><span class="field-prefix">' . t('Display Type') . '</span>',
-      '#suffix' => '</div>',
-      '#default_value' => $conf['view_settings'],
-      '#weight' => 10,
-      '#options' => array(
-        'fields' => t('Fields'),
-        'rendered_entity' => t('Content'),
-        'table' => t('Table'),
-      ),
-    );
+  // Deal with legacy 'nodes' and others (such as 'files') view settings so
+  // that other entity types can be included.
+  $conf['view_settings'] = panopoly_magic_convert_view_settings($conf['view_settings']);
 
-    // Add header column options for table views.
-    $form['display_settings']['header_type'] = array(
-      '#type' => 'select',
-      '#title' => t('Column Header'),
-      '#options' => array(
-        'none' => t('None'),
-        'titles' => t('Titles'),
-      ),
-      '#default_value' => !empty($conf['header_type']) ? $conf['header_type'] : 'none',
-      '#states' => array(
-        'visible' => array(
-          ':input[name="view_settings"]' => array('value' => 'table'),
-        ),
-      ),
-      '#weight' => 11,
-    );
+  // Add information about the View Mode
+  $form['display_settings']['view_settings'] = array(
+    '#type' => 'radios',
+    '#prefix' => '<div class="view-settings-wrapper"><span class="field-prefix">' . t('Display Type') . '</span>',
+    '#suffix' => '</div>',
+    '#default_value' => $conf['view_settings'],
+    '#weight' => 10,
+    '#options' => array(
+      'fields' => t('Fields'),
+      'rendered_entity' => t('Content'),
+      'table' => t('Table'),
+    ),
+  );
 
-    // Update the field overrides to be dependent on the view settings selection.
-    $form['fields_override']['#states'] = array(
-      // The inverted logic here isn't optimal, and in the future may be better achieved via OR'd conditions.
-      // @link http://drupal.org/node/735528 @endlink
-      'invisible' => array(
-        ':input[name="view_settings"]' => array('value' => 'rendered_entity'),
+  // Add header column options for table views.
+  $form['display_settings']['header_type'] = array(
+    '#type' => 'select',
+    '#title' => t('Column Header'),
+    '#options' => array(
+      'none' => t('None'),
+      'titles' => t('Titles'),
+    ),
+    '#default_value' => !empty($conf['header_type']) ? $conf['header_type'] : 'none',
+    '#states' => array(
+      'visible' => array(
+        ':input[name="view_settings"]' => array('value' => 'table'),
       ),
-    );
-  }
+    ),
+    '#weight' => 11,
+  );
+
+  // Update the field overrides to be dependent on the view settings selection.
+  $form['fields_override']['#states'] = array(
+    // The inverted logic here isn't optimal, and in the future may be better achieved via OR'd conditions.
+    // @link http://drupal.org/node/735528 @endlink
+    'invisible' => array(
+      ':input[name="view_settings"]' => array('value' => 'rendered_entity'),
+    ),
+  );
 
   // Get view modes for entity
   $view_modes = panopoly_magic_view_mode_options(panopoly_magic_get_entity_type($form_state['view']));