diff --git a/entityform.module b/entityform.module
index 80df682..fcd76c6 100644
--- a/entityform.module
+++ b/entityform.module
@@ -725,9 +725,9 @@ function entityform_draft_page($entityform_type) {
 
   drupal_alter(
     array(
-    'entityform_draft_page',
-    "entityform_{$entityform_type->type}_draft_page",
-  ),
+      'entityform_draft_page',
+      "entityform_{$entityform_type->type}_draft_page",
+    ),
     $render_array,
     $entityform_type,
     $args
@@ -762,9 +762,9 @@ function entityform_confirm_page($entityform_type) {
 
   drupal_alter(
     array(
-    'entityform_confirm_page',
-    "entityform_{$entityform_type->type}_confirm_page",
-  ),
+      'entityform_confirm_page',
+      "entityform_{$entityform_type->type}_confirm_page",
+    ),
     $render_array,
     $entityform_type,
     $entityform_id
@@ -827,16 +827,16 @@ function entityform_entity_presave($entity, $type) {
             $path['language'] = LANGUAGE_NONE;
             // Check to see if alias is exact same as original
             if (!empty($original_path['alias'])
-                && $original_path['alias'] == $path['alias'] && $path['source'] == $original_path['source']) {
+              && $original_path['alias'] == $path['alias'] && $path['source'] == $original_path['source']) {
               continue;
             }
 
             if (_entityform_alias_is_used($path)) {
               watchdog('entityform', "Could not create alias @alias for EntityformType entity '@type'",
                 array(
-                '@alias' => $path['alias'],
-                '@type' => $entity->type,
-              ),
+                  '@alias' => $path['alias'],
+                  '@type' => $entity->type,
+                ),
                 WATCHDOG_WARNING
               );
             }
@@ -1050,9 +1050,9 @@ function _entityform_get_submit_info($entityform) {
   $account = user_load($entityform->uid);
   return t("Submitted by !name on !date",
     array(
-    '!name' => theme('username', array('account' => $account)),
-    '!date' => format_date($entityform->created),
-  )
+      '!name' => theme('username', array('account' => $account)),
+      '!date' => format_date($entityform->created),
+    )
   );
 }
 
@@ -1446,8 +1446,11 @@ function _entityform_type_get_path_types($type) {
  */
 function entityform_views_pre_view(&$view, &$display_id, &$args) {
   if ($view->base_table == 'entityform' && strpos($display_id, 'autofields_') === 0) {
-    $type = $view->args[0];
-    _entityform_view_add_all_fields($view, $display_id, $type);
+    if (empty($view->display[$display_id]->entityform_settings['autofields'])) {
+      $type = $view->args[0];
+      _entityform_view_add_all_fields($view, $display_id, $type);
+    }
+
   }
   return;
 }
@@ -1531,7 +1534,7 @@ function entityform_help($path, $arg) {
       break;
     case 'admin/structure/entityform_types/manage/%/submissions':
       $display_id = $arg[6];
-      // Intentionally no "break" here. It should fall through.
+    // Intentionally no "break" here. It should fall through.
     case 'admin/reports/entityforms/submissions/%':
       if ($path == 'admin/reports/entityforms/submissions/%') {
         $display_id = $arg[5];
@@ -1678,7 +1681,7 @@ function entityform_views_query_alter(&$view, &$query) {
   // 2. Base table is 'entityform'
   // 3. User doesn't have 'view any entityform'
   if (!empty($view->query->tags) && in_array('user_access', $view->query->tags)
-     && $view->base_table == 'entityform' && !user_access('view any entityform')
+    && $view->base_table == 'entityform' && !user_access('view any entityform')
   ) {
     // @todo user $query to make sure this is the alias
     $table_alias = 'entityform';