diff --git a/src/Plugin/Block/ModalBlock.php b/src/Plugin/Block/ModalBlock.php
index 55e62d7..886c668 100755
--- a/src/Plugin/Block/ModalBlock.php
+++ b/src/Plugin/Block/ModalBlock.php
@@ -22,10 +22,18 @@ class ModalBlock extends BlockBase implements BlockPluginInterface {
     $form = parent::blockForm($form, $form_state);
 
     $config = $this->getConfiguration();
+    if (!empty($config['block'])) {
+      foreach ($config['block'] as $value) {
+        $blocks_id[] = $value['target_id'];
+      }
+      $entity_block = \Drupal\block\Entity\Block::loadMultiple($blocks_id);
+    }
     $form['block'] = array (
      '#type' => 'entity_autocomplete',
      '#title' => 'Block',
      '#target_type' => 'block',
+     '#tags' => TRUE,
+     '#default_value' => !empty($entity_block) ? $entity_block : array(),
     );
 
     $form['frequency'] = array (