diff --git a/setup.cfg b/setup.cfg
index 8dd4266..c4e32bd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = wagtail_fedit
-version = 1.4.8a3
+version = 1.4.8a4
 description = Frontend editing for your Wagtail site
 long_description = file: README.md
 long_description_content_type = text/markdown
diff --git a/wagtail_fedit/adapters/base.py b/wagtail_fedit/adapters/base.py
index 7a85748..9c29277 100644
--- a/wagtail_fedit/adapters/base.py
+++ b/wagtail_fedit/adapters/base.py
@@ -73,6 +73,9 @@ def check_permissions(self):
             return False
         return True
     
+    def get_element_id(self) -> str:
+        raise NotImplementedError
+    
     def get_form(self) -> "forms.Form":
         raise NotImplementedError
 
diff --git a/wagtail_fedit/adapters/block.py b/wagtail_fedit/adapters/block.py
index d2acf98..a3f6665 100644
--- a/wagtail_fedit/adapters/block.py
+++ b/wagtail_fedit/adapters/block.py
@@ -63,6 +63,9 @@ def get_header_title(self):
             "model_name": self.model._meta.verbose_name,
             "model_string": model_string,
         }
+    
+    def get_element_id(self) -> str:
+        return f"block-{self.kwargs['block_id']}-section"
 
     def get_form(self):
 
diff --git a/wagtail_fedit/adapters/field.py b/wagtail_fedit/adapters/field.py
index 31a7870..3c0d6eb 100644
--- a/wagtail_fedit/adapters/field.py
+++ b/wagtail_fedit/adapters/field.py
@@ -109,7 +109,11 @@ def get_help_text(self):
             }
 
         return super().get_help_text()
-        
+          
+    def get_element_id(self) -> str:
+        m = self.model
+        return f"field-{self.field_name}-{m._meta.app_label}-{m._meta.model_name}-{self.object.pk}"
+  
     def get_form(self):
         if self.request.method == "POST":
             form = self.form_class(self.request.POST, request=self.request, instance=self.object)
diff --git a/wagtail_fedit/templates/wagtail_fedit/content/editable_adapter.html b/wagtail_fedit/templates/wagtail_fedit/content/editable_adapter.html
index ef0ca88..61bbfe3 100644
--- a/wagtail_fedit/templates/wagtail_fedit/content/editable_adapter.html
+++ b/wagtail_fedit/templates/wagtail_fedit/content/editable_adapter.html
@@ -1,4 +1,4 @@
-<div class="wagtail-fedit-adapter-wrapper{%if shared_context.inline%} wagtail-fedit-inline{%endif%} wagtail-fedit-{{ identifier }}"{% if shared %} data-shared-context="{{ shared }}"{%endif%} data-edit-url="{{ edit_url }}">
+<div id="{{ adapter.get_element_id }}" class="wagtail-fedit-adapter-wrapper{%if shared_context.inline%} wagtail-fedit-inline{%endif%} wagtail-fedit-{{ identifier }}"{% if shared %} data-shared-context="{{ shared }}"{%endif%} data-edit-url="{{ edit_url }}">
     <div class="wagtail-fedit-buttons">
         {% for button in buttons %}
             {{ button }}
diff --git a/wagtail_fedit/templatetags/fedit.py b/wagtail_fedit/templatetags/fedit.py
index 0ea6095..39425fd 100644
--- a/wagtail_fedit/templatetags/fedit.py
+++ b/wagtail_fedit/templatetags/fedit.py
@@ -158,7 +158,6 @@ def wrap_adapter(request: HttpRequest, adapter: BaseAdapter, context: dict) -> s
 
     context["wagtail_fedit_field"] = adapter.field_name
     context["wagtail_fedit_instance"] = adapter.object
-    
     context["request"] = request
 
     content = adapter.render_content(context)
@@ -185,7 +184,6 @@ def wrap_adapter(request: HttpRequest, adapter: BaseAdapter, context: dict) -> s
     return render_to_string(
         "wagtail_fedit/content/editable_adapter.html",
         {
-            "request": request,
             "identifier": adapter.identifier,
             "content": content,
             "adapter": adapter,