diff --git a/src/Form/FacetForm.php b/src/Form/FacetForm.php
index 3870704..00ac185 100644
--- a/src/Form/FacetForm.php
+++ b/src/Form/FacetForm.php
@@ -336,6 +336,8 @@ class FacetForm extends EntityForm {
       $view->setDisplay($display);
       $view->display_handler->overrideOption('cache', ['type' => 'none']);
       $view->save();
+
+      $display_plugin = $view->getDisplay()->getPluginId();
     }
 
     if ($is_new) {
@@ -344,6 +346,10 @@ class FacetForm extends EntityForm {
         drupal_set_message($message);
         $form_state->setRedirect('entity.facets_facet.display_form', ['facets_facet' => $facet->id()]);
       }
+
+      if ($display_plugin === 'block') {
+        $facet->setOnlyVisibleWhenFacetSourceIsVisible(FALSE);
+      }
     }
     else {
       drupal_set_message(t('Facet %name has been updated.', ['%name' => $facet->getName()]));