diff --git a/profiles/panopoly/modules/panopoly/panopoly_magic/panopoly_magic.module b/profiles/panopoly/modules/panopoly/panopoly_magic/panopoly_magic.module
index 7fe100c..1f2234b 100644
--- a/profiles/panopoly/modules/panopoly/panopoly_magic/panopoly_magic.module
+++ b/profiles/panopoly/modules/panopoly/panopoly_magic/panopoly_magic.module
@@ -632,6 +632,15 @@ function panopoly_magic_form_views_content_views_panes_content_type_edit_form_al
     if (empty($conf['view_settings'])) {
       $conf['view_settings'] = 'fields';
     }
+    
+    if($form_state['view']->base_table == 'file_managed'){
+      $entity_type = 'file';
+      $entity_type_plural = 'files';
+    }
+    else{
+      $entity_type = 'node';
+      $entity_type_plural = 'nodes';
+    }
 
     // Add information about the View Mode
     $form['display_settings']['view_settings'] = array(
@@ -642,7 +651,7 @@ function panopoly_magic_form_views_content_views_panes_content_type_edit_form_al
       '#weight' => 10,
       '#options' => array(
         'fields' => t('Fields'),
-        'nodes' => t('Content'),
+        $entity_type_plural => t('Content'),
         'table' => t('Table'),
       ),
     );
@@ -669,7 +678,7 @@ function panopoly_magic_form_views_content_views_panes_content_type_edit_form_al
       // 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' => 'nodes'), 
+        ':input[name="view_settings"]' => array('value' => $entity_type_plural), 
       ),
     );
   }
@@ -677,11 +686,11 @@ function panopoly_magic_form_views_content_views_panes_content_type_edit_form_al
   // Add specific style options.
   $form['content_settings']['view_mode'] = array(
     '#type' => 'radios',
-    '#options' => panopoly_magic_view_mode_options(),
+    '#options' => panopoly_magic_view_mode_options($entity_type),
     '#default_value' => $conf['view_mode'] ? $conf['view_mode'] : 'teaser',
     '#states' => array(
       'visible' => array(
-        ':input[name="view_settings"]' => array('value' => 'nodes'),
+        ':input[name="view_settings"]' => array('value' => $entity_type_plural),
       ),
     ),
   );
@@ -1189,6 +1198,30 @@ function panopoly_magic_views_pre_render(&$view) {
         $view->style_plugin->row_plugin->nodes = $nodes;
       }
     }
+    // Determine that this was previously a field view, which has been overridden to a files view in the pane config.
+    elseif (!empty($conf['view_settings']) && $conf['view_settings'] == 'files' && empty($view->style_plugin->row_plugin->files)) {
+
+      // Reconstruct the files array which a node row style expects.
+      if (!empty($view->result)) {
+        $fids = array();
+        foreach ($view->result as $result) {
+          if (!empty($result->fid)) {
+            $fids[] = $result->fid;
+          }
+        }
+        $files = file_load_multiple($fids);
+      }
+
+      // Change the row plugin.
+     if (!empty($files)) {
+        $view->style_plugin->row_plugin = views_get_plugin('row', 'file');
+        $view->style_plugin->row_plugin->view =& $view;
+        $view->style_plugin->row_plugin->display =& $view->display_handler->display;
+        $view->style_plugin->row_plugin->field_alias = 'fid';
+        $view->style_plugin->row_plugin->files = $files;
+      }  
+      
+    }
     // Set the style plugin to a table style.
     elseif (!empty($conf['view_settings']) && $conf['view_settings'] == 'table') {
       $row_plugin = $view->style_plugin->row_plugin;
@@ -1315,12 +1348,12 @@ function panopoly_magic_process_panels_add_content_modal(&$vars) {
 /**
  * Helper function to get view modes
  */
-function panopoly_magic_view_mode_options() {
-  $entity_info = entity_get_info('node');
+function panopoly_magic_view_mode_options($entity_type) {
+  $entity_info = entity_get_info($entity_type);
   $options = array();
   if (!empty($entity_info['view modes'])) {
     foreach ($entity_info['view modes'] as $mode => $settings) {
-      if (!in_array($mode, array('rss', 'search_index', 'search_result', 'token'))) {
+      if (!in_array($mode, array('rss', 'search_index', 'search_result', 'token', 'preview'))) {
         $options[$mode] = $settings['label'];
       }
     }