diff --git a/src/Controllers/EntityBrowserController.php b/src/Controllers/EntityBrowserController.php
index 06206fe..581a1c4 100644
--- a/src/Controllers/EntityBrowserController.php
+++ b/src/Controllers/EntityBrowserController.php
@@ -73,6 +73,11 @@ class EntityBrowserController extends ControllerBase {
     if ($operation && $form_state && !$form_state->isExecuted()) {
       // Return the form as a modal dialog.
       $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
+      $form['messages'] = [
+        '#type' => 'status_messages',
+        '#weight' => -10000,
+        '#access' => (bool) $this->messenger()->all(),
+      ];
       $title = $this->t('Edit @entity', ['@entity' => $entity->label()]);
       $response = (new AjaxResponse())->addCommand(new OpenDialogCommand('#' . $entity->getEntityTypeId() . '-' . $entity->id() . '-edit-dialog', $title, $form, ['modal' => TRUE, 'width' => 800]));
       return $response;
@@ -85,6 +90,14 @@ class EntityBrowserController extends ControllerBase {
       if (!empty($details_id)) {
         $response->addCommand(new ValueUpdatedCommand($details_id));
 
+        if ($this->messenger()->all()) {
+          $response->addCommand(new OpenDialogCommand('#eb-messages-modal', $this->t('Messages'), [
+            '#type' => 'status_messages',
+            '#weight' => -10000,
+            '#access' => (bool)$this->messenger()->all(),
+          ], ['modal' => TRUE, 'width' => '50%']));
+        }
+
         if (empty($operation)) {
           $response->addCommand(new AlertCommand($this->t("An edit form couldn't be found.")));
         }