diff --git a/panopoly_magic.module b/panopoly_magic.module
index f770267..d1d5232 100644
--- a/panopoly_magic.module
+++ b/panopoly_magic.module
@@ -784,7 +784,7 @@ function panopoly_magic_form_views_content_views_panes_content_type_edit_form_al
   $view_modes = panopoly_magic_view_mode_options(panopoly_magic_get_entity_type($form_state['view']));
 
   // Get the default view mode.
-  $options_default_view_mode = 'full';
+  $options_default_view_mode = ($view_handler->options['row_plugin'] == 'fields') ? 'teaser' : 'full';
   if (isset($form_state['view']->style_plugin->display->display_options['row_options']['view_mode'])) {
     $options_default_view_mode = $form_state['view']->style_plugin->display->display_options['row_options']['view_mode'];
   }