diff --git a/eva.module b/eva.module
index 1e80940..b5f0c47 100644
--- a/eva.module
+++ b/eva.module
@@ -109,13 +109,6 @@ function eva_entity_view(array &$build, EntityInterface $entity, EntityViewDispl
           // save the entity for path calculation
           $view->current_entity = $entity;
 
-          // exposed form
-          if ($info['uses exposed']) {
-            $view->initHandlers();
-            $exposed_form = $view->display_handler->getPlugin('exposed_form');
-            $build[$longname . '_form'] = $exposed_form->renderExposedForm(TRUE);
-          }
-
           // gather info about the attched-to entity
           $entity_type = $view->display_handler->getOption('entity_type');
           $entity_info = \Drupal::entityManager()->getDefinition($entity_type);
@@ -149,6 +142,13 @@ function eva_entity_view(array &$build, EntityInterface $entity, EntityViewDispl
             $view->element['#cache']['keys'] = array_merge([implode(':', $view->args)], $view->element['#cache']['keys']);
           }
 
+          // exposed form
+          if ($info['uses exposed']) {
+            $view->initHandlers();
+            $exposed_form = $view->display_handler->getPlugin('exposed_form');
+            $build[$longname . '_form'] = $exposed_form->renderExposedForm(TRUE);
+          }
+
           // build the render
           $element = $view->buildRenderable($info['display']);
 
diff --git a/templates/eva-display-entity-view.html.twig b/templates/eva-display-entity-view.html.twig
index d9a0da9..16b4d93 100644
--- a/templates/eva-display-entity-view.html.twig
+++ b/templates/eva-display-entity-view.html.twig
@@ -59,6 +59,7 @@
     </header>
   {% endif %}
 
+  {{ exposed }}
   {{ attachment_before }}
 
   {{ rows }}