diff --git a/eva-display-entity-view.tpl.php b/eva-display-entity-view.tpl.php
index a0317bf..e661ad1 100755
--- a/eva-display-entity-view.tpl.php
+++ b/eva-display-entity-view.tpl.php
@@ -39,6 +39,12 @@
     </div>
   <?php endif; ?>
 
+  <?php if ($exposed && !$exposed_form_as_field): ?>
+    <div class="view-filters">
+      <?php print $exposed; ?>
+    </div>
+  <?php endif; ?>
+    
   <?php if ($attachment_before): ?>
     <div class="attachment attachment-before">
       <?php print $attachment_before; ?>
diff --git a/eva.module b/eva.module
index 884c303..5e836e6 100755
--- a/eva.module
+++ b/eva.module
@@ -36,7 +36,7 @@ function eva_field_extra_fields() {
           'weight' => 10,
         );
         // Provide a separate extra field for the exposed form if there is any.
-        if ($view['exposed form']) {
+        if ($view['exposed form'] && $view['exposed form split']) {
           $extras[$entity][$bundle]['display'][$view['name'] . '_' . $view['display'] . '_' . 'form'] = array(
             'label' => ((empty($view['title'])) ? $view['name'] : $view['title']) . ' (' . t('Exposed form') . ')', 
             'description' => t('The exposed filter form of the view.'),
@@ -146,6 +146,7 @@ function eva_get_views($type = NULL, $reset = FALSE) {
           'display' => $display_id,
           'bundles' => $view->display_handler->get_option('bundles'),
           'exposed form' => $view->display_handler->uses_exposed(),
+          'exposed form split' => $view->display_handler->get_option('exposed_form_as_field'),
         );
         $view->destroy();
       }
diff --git a/eva.theme.inc b/eva.theme.inc
index d60caf2..b64c0db 100755
--- a/eva.theme.inc
+++ b/eva.theme.inc
@@ -10,6 +10,7 @@ function template_preprocess_eva_display_entity_view(&$vars) {
   $view = $vars['view'];
   $display = $view->display_handler;
   $vars['title'] = $display->get_option('show_title') ? filter_xss_admin($view->get_title()) : '';
+  $vars['exposed_form_as_field'] = $display->get_option('exposed_form_as_field');
 }
 
 function template_process_eva_display_entity_view(&$vars) {
diff --git a/eva_plugin_display_entity.inc b/eva_plugin_display_entity.inc
index 0818490..449a65b 100755
--- a/eva_plugin_display_entity.inc
+++ b/eva_plugin_display_entity.inc
@@ -12,6 +12,7 @@ class eva_plugin_display_entity extends views_plugin_display {
     $options['argument_mode'] = array('default' => 'id');
     $options['default_argument'] = array('default' => '');
     $options['show_title'] = 0;
+    $options['exposed_form_as_field'] = 0;
 
     return $options;
   }
@@ -66,6 +67,12 @@ class eva_plugin_display_entity extends views_plugin_display {
       'title' => t('Show title'),
       'value' => $this->get_option('show_title') ? t('Yes') : t('No'),
     );
+    
+    $options['exposed_form_as_field'] = array(
+      'category' => 'entity_view',
+      'title' => t('Exposed Form as Field'),
+      'value' => $this->get_option('exposed_form_as_field') ? t('Yes') : t('No'),
+    );
 
     if (module_exists('token')) {
       // We must load token values here to show them on the options form.
@@ -166,6 +173,14 @@ class eva_plugin_display_entity extends views_plugin_display {
           '#default_value' => $this->get_option('show_title'),
         );
         break;
+      case 'exposed_form_as_field':
+        $form['#title'] .= t('Exposed Form as Field');
+        $form['exposed_form_as_field'] = array(
+          '#type' => 'checkbox',
+          '#title' => t('Split off Exposed Form as Separate Field'),
+          '#default_value' => $this->get_option('exposed_form_as_field'),
+          '#description' => t('Check this box to have a separate field for this view\'s exposed form on the "Manage Display" tab'),
+        );
     }
 
   }
@@ -209,6 +224,10 @@ class eva_plugin_display_entity extends views_plugin_display {
       case 'show_title':
         $this->set_option('show_title', $form_state['values']['show_title']);
         break;
+      case 'exposed_form_as_field':
+        $this->set_option('exposed_form_as_field', $form_state['values']['exposed_form_as_field']);
+        break;
+      
     }
   }