diff --git a/src/Form/EditableFieldsForm.php b/src/Form/EditableFieldsForm.php
index 1665f71..acc1ec0 100644
--- a/src/Form/EditableFieldsForm.php
+++ b/src/Form/EditableFieldsForm.php
@@ -98,10 +98,16 @@ class EditableFieldsForm extends FormBase implements BaseFormIdInterface {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-    // Get fresh entity.
-    $entity = $this->entityTypeManager
-      ->getStorage($entity->getEntityTypeId())
-      ->load($entity->id());
+    // Get fresh entity only if entity has a valid ID.
+    if ($entity->id()) {
+      $entity = $this->entityTypeManager
+        ->getStorage($entity->getEntityTypeId())
+        ->load($entity->id());
+    }
+    // If entity is NULL or couldn't be loaded, use the original entity.
+    if (!$entity) {
+      $entity = $this->entity;
+    }
     $wrapper = str_replace('_', '-', $this->getFormId()) . '-wrapper';
     $fallback = $this->settings['fallback_edit'];
     $form['#prefix'] = "<div id=\"$wrapper\">";
diff --git a/src/Plugin/Field/FieldFormatter/EditableFieldsFieldFormatter.php b/src/Plugin/Field/FieldFormatter/EditableFieldsFieldFormatter.php
index bb41fcc..3bcdd62 100644
--- a/src/Plugin/Field/FieldFormatter/EditableFieldsFieldFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/EditableFieldsFieldFormatter.php
@@ -235,6 +235,18 @@ class EditableFieldsFieldFormatter extends FormatterBase {
       );
       $selector .= '-editablefields-popup';
       $view_mode = $this->getSetting('display_mode_edit') ?: 'default';
+
+      // Skip popup for entities without ID (e.g., new entities in layout builder).
+      if (!$entity->id()) {
+        return [
+          [
+            'field' => $entity->get($field_name)->view($view_mode),
+            '#prefix' => '<div class="' . $selector . '">',
+            '#suffix' => '<div/>',
+          ],
+        ];
+      }
+
       $link = Link::createFromRoute(
         $this->t('Edit'),
         'editablefields.get_from',
diff --git a/src/services/EditableFieldsHelper.php b/src/services/EditableFieldsHelper.php
index 62f7b6f..0f1ce3d 100644
--- a/src/services/EditableFieldsHelper.php
+++ b/src/services/EditableFieldsHelper.php
@@ -224,7 +224,7 @@ class EditableFieldsHelper {
     $parts = [
       $entity->getEntityTypeId(),
       $entity->bundle(),
-      $entity->id(),
+      $entity->id() ?: 'new',
       $field_name,
       $form_mode,
     ];