diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
index 04c5f04..4380856 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
@@ -176,10 +176,23 @@ public function submitOptionsForm(&$form, &$form_state) {
    * Block views use exposed widgets only if AJAX is set.
    */
   public function usesExposed() {
-      if ($this->isAJAXEnabled()) {
-        return parent::usesExposed();
+    if ($this->isAJAXEnabled()) {
+      return parent::usesExposed();
+    }
+    return FALSE;
+  }
+
+  /**
+   * Overrides \Drupal\views\Plugin\views\display\DisplayPluginBase::remove().
+   */
+  public function remove() {
+    parent::remove();
+
+    foreach (entity_load_multiple('block') as $block_id => $block) {
+      if (strpos($block->get('plugin'), 'views_block:') !== FALSE) {
+        $block->delete();
       }
-      return FALSE;
     }
+  }
 
 }
diff --git a/core/modules/views/lib/Drupal/views/DisplayBag.php b/core/modules/views/lib/Drupal/views/DisplayBag.php
index d9edd63..72023f3 100644
--- a/core/modules/views/lib/Drupal/views/DisplayBag.php
+++ b/core/modules/views/lib/Drupal/views/DisplayBag.php
@@ -92,4 +92,14 @@ protected function initializePlugin($display_id) {
     }
   }
 
+  /**
+   * Overrides \Drupal\Component\Plugin\PluginBag::remove().
+   */
+  public function remove($instance_id) {
+    $this->get($instance_id)->remove();
+
+    parent::remove($instance_id);
+  }
+
+
 }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index b0c6511..d3aecbc 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -2589,6 +2589,13 @@ public function validate() {
   }
 
   /**
+   * React on deleting a display.
+   */
+  public function remove() {
+
+  }
+
+  /**
    * Check if the provided identifier is unique.
    *
    * @param string $id