diff --git a/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSourceDeriver.php b/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSourceDeriver.php
index e14b487..28689fb 100644
--- a/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSourceDeriver.php
+++ b/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSourceDeriver.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
  * Derives a facet source plugin definition for every search api view.
  *
- * @see \Drupal\facets\Plugin\facets\facet_source\SearchApiViewsPage
+ * @see \Drupal\facets\Plugin\facets\facet_source\SearchApiViews
  */
 class CoreNodeSearchFacetSourceDeriver extends FacetSourceDeriverBase {
 
diff --git a/src/Plugin/facets/facet_source/SearchApiViewsPage.php b/src/Plugin/facets/facet_source/SearchApiViews.php
similarity index 73%
rename from src/Plugin/facets/facet_source/SearchApiViewsPage.php
rename to src/Plugin/facets/facet_source/SearchApiViews.php
index 665fd1c..1b075d2 100644
--- a/src/Plugin/facets/facet_source/SearchApiViewsPage.php
+++ b/src/Plugin/facets/facet_source/SearchApiViews.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\facets\Plugin\facets\facet_source\SearchApiViewsPage.
+ * Contains \Drupal\facets\Plugin\facets\facet_source\SearchApiViews.
  */
 
 namespace Drupal\facets\Plugin\facets\facet_source;
@@ -11,6 +11,7 @@ use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\facets\FacetSource\SearchApiFacetSourceInterface;
 use Drupal\search_api\Plugin\views\query\SearchApiQuery;
 use Drupal\search_api\Query\ResultSetInterface;
+use Drupal\views\Entity\View;
 use Drupal\views\Views;
 
 
@@ -19,10 +20,10 @@ use Drupal\views\Views;
  *
  * @FacetsFacetSource(
  *   id = "search_api_views",
- *   deriver = "Drupal\facets\Plugin\facets\facet_source\SearchApiViewsPageDeriver"
+ *   deriver = "Drupal\facets\Plugin\facets\facet_source\SearchApiViewsDeriver"
  * )
  */
-class SearchApiViewsPage extends SearchApiBaseFacetSource implements SearchApiFacetSourceInterface {
+class SearchApiViews extends SearchApiBaseFacetSource implements SearchApiFacetSourceInterface {
 
   use DependencySerializationTrait;
 
@@ -81,9 +82,16 @@ class SearchApiViewsPage extends SearchApiBaseFacetSource implements SearchApiFa
    * {@inheritdoc}
    */
   public function getPath() {
-    $view = Views::getView($this->pluginDefinition['view_id']);
-    $view->setDisplay($this->pluginDefinition['view_display']);
-    return $view->getDisplay()->getPath();
+    $display = View::load($this->pluginDefinition['view_id'])->getDisplay($this->pluginDefinition['view_display']);
+    switch ($display['display_plugin']) {
+      case 'page':
+        $view = Views::getView($this->pluginDefinition['view_id']);
+        $view->setDisplay($this->pluginDefinition['view_display']);
+        return '/' . $view->getDisplay()->getPath();
+      case 'block':
+      default:
+        return \Drupal::service('path.current')->getPath();
+    }
   }
 
   /**
@@ -129,13 +137,22 @@ class SearchApiViewsPage extends SearchApiBaseFacetSource implements SearchApiFa
    * {@inheritdoc}
    */
   public function isRenderedInCurrentRequest() {
-    $request = \Drupal::requestStack()->getMasterRequest();
-    if ($request->attributes->get('_controller') === 'Drupal\views\Routing\ViewPageController::handle') {
-      list(, $search_api_view_id, $search_api_view_display) = explode(':', $this->getPluginId());
-
-      if ($request->attributes->get('view_id') == $search_api_view_id && $request->attributes->get('display_id') == $search_api_view_display) {
+    $display = View::load($this->pluginDefinition['view_id'])->getDisplay($this->pluginDefinition['view_display']);
+    switch ($display['display_plugin']) {
+      case 'page':
+        $request = \Drupal::requestStack()->getMasterRequest();
+        if ($request->attributes->get('_controller') === 'Drupal\views\Routing\ViewPageController::handle') {
+          list(, $search_api_view_id, $search_api_view_display) = explode(':', $this->getPluginId());
+
+          if ($request->attributes->get('view_id') == $search_api_view_id && $request->attributes->get('display_id') == $search_api_view_display) {
+            return TRUE;
+          }
+        }
+        return FALSE;
+
+      case 'block':
+        // There is no way to know if a block is embedded on a page.
         return TRUE;
-      }
     }
     return FALSE;
   }
diff --git a/src/Plugin/facets/facet_source/SearchApiViewsPageDeriver.php b/src/Plugin/facets/facet_source/SearchApiViewsDeriver.php
similarity index 93%
rename from src/Plugin/facets/facet_source/SearchApiViewsPageDeriver.php
rename to src/Plugin/facets/facet_source/SearchApiViewsDeriver.php
index 8793b80..cdb1aab 100644
--- a/src/Plugin/facets/facet_source/SearchApiViewsPageDeriver.php
+++ b/src/Plugin/facets/facet_source/SearchApiViewsDeriver.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\facets\Plugin\facets\facet_source\SearchApiViewsPageDeriver.
+ * Contains \Drupal\facets\Plugin\facets\facet_source\SearchApiViewsDeriver.
  */
 
 namespace Drupal\facets\Plugin\facets\facet_source;
@@ -13,9 +13,9 @@ use Drupal\facets\FacetSource\FacetSourceDeriverBase;
 /**
  * Derives a facet source plugin definition for every search api view.
  *
- * @see \Drupal\facets\Plugin\facets\facet_source\SearchApiViewsPage
+ * @see \Drupal\facets\Plugin\facets\facet_source\SearchApiViews
  */
-class SearchApiViewsPageDeriver extends FacetSourceDeriverBase {
+class SearchApiViewsDeriver extends FacetSourceDeriverBase {
 
   /**
    * {@inheritdoc}
@@ -35,7 +35,7 @@ class SearchApiViewsPageDeriver extends FacetSourceDeriverBase {
         if (strpos($view->get('base_table'), 'search_api_index') !== FALSE) {
           $displays = $view->get('display');
           foreach ($displays as $name => $display_info) {
-            if ($display_info['display_plugin'] == "page") {
+            if (in_array($display_info['display_plugin'], ['page', 'block'])) {
               $machine_name = $view->id() . PluginBase::DERIVATIVE_SEPARATOR . $name;
 
               $plugin_derivatives[$machine_name] = [
diff --git a/src/Plugin/facets/url_processor/QueryString.php b/src/Plugin/facets/url_processor/QueryString.php
index 7c72c37..e08238a 100644
--- a/src/Plugin/facets/url_processor/QueryString.php
+++ b/src/Plugin/facets/url_processor/QueryString.php
@@ -68,7 +68,7 @@ class QueryString extends UrlProcessorPluginBase {
 
     $request = $this->request;
     if ($facet->getFacetSource()->getPath()) {
-      $request = Request::create('/' . $facet->getFacetSource()->getPath());
+      $request = Request::create($facet->getFacetSource()->getPath());
     }
     $url = Url::createFromRequest($request);
 
diff --git a/src/Tests/IntegrationTest.php b/src/Tests/IntegrationTest.php
index 3738c1b..f534131 100644
--- a/src/Tests/IntegrationTest.php
+++ b/src/Tests/IntegrationTest.php
@@ -92,7 +92,7 @@ class IntegrationTest extends FacetWebTestBase {
     $this->assertFacetBlocksAppear();
 
     // Show the facet only when the facet source is visible.
-    // @TODO Only for SearchApiViewsPage for the moment.
+    // @TODO Only for SearchApiViews for the moment.
     $this->setOptionShowOnlyWhenFacetSourceVisible($facet_name);
     $this->goToDeleteFacetPage($facet_name);
     $this->assertNoText('item');
diff --git a/tests/facets_query_processor/src/Plugin/facets/url_processor/DummyQuery.php b/tests/facets_query_processor/src/Plugin/facets/url_processor/DummyQuery.php
index bc17ce2..35700c5 100644
--- a/tests/facets_query_processor/src/Plugin/facets/url_processor/DummyQuery.php
+++ b/tests/facets_query_processor/src/Plugin/facets/url_processor/DummyQuery.php
@@ -89,7 +89,7 @@ class DummyQuery extends UrlProcessorPluginBase {
       $result_get_params->set($this->filterKey, $filter_params);
       $request = $this->request;
       if ($facet->getFacetSource()->getPath()) {
-        $request = Request::create('/' . $facet->getFacetSource()->getPath());
+        $request = Request::create($facet->getFacetSource()->getPath());
       }
       $url = Url::createFromRequest($request);
       $url->setOption('query', $result_get_params->all());