diff --git a/core/modules/quickedit/js/quickedit.js b/core/modules/quickedit/js/quickedit.js
index 2c3258c..84e90a1 100644
--- a/core/modules/quickedit/js/quickedit.js
+++ b/core/modules/quickedit/js/quickedit.js
@@ -369,9 +369,11 @@
     var entityElement = $(fieldElement).closest(entityElementSelector);
     // In the case of a full entity view page, the entity title is rendered
     // outside of "the entity DOM node": it's rendered as the page title. So in
-    // this case, we must find the entity in the mandatory "content" region.
+    // this case, we find the main element of the page and use it as a full
+    // entity ancestor.
     if (entityElement.length === 0) {
-      entityElement = $('.region-content').find(entityElementSelector);
+      // entityElement = $('[data-drupal-region="content"]').find(entityElementSelector);
+      entityElement = $('.js-quickedit').find(entityElementSelector);      
     }
     var entityInstanceID = entityElement
       .get(0)
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index b80310e..95ce7d3 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -96,7 +96,7 @@
 
   {{ page.help }}
 
-  <main role="main">
+  <main role="main" class="js-quickedit">
     <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
     <div class="layout-content">
diff --git a/core/modules/system/templates/radios.html.twig b/core/modules/system/templates/radios.html.twig
index bf38830..e397644 100644
--- a/core/modules/system/templates/radios.html.twig
+++ b/core/modules/system/templates/radios.html.twig
@@ -12,4 +12,4 @@
  * @ingroup themeable
  */
 #}
-<div{{ attributes.addClass('form-radios') }}>{{ children }}</div>
+<div{{ attributes }}>{{ children }}</div>
diff --git a/core/modules/system/templates/region.html.twig b/core/modules/system/templates/region.html.twig
index b2c5471..e009455 100644
--- a/core/modules/system/templates/region.html.twig
+++ b/core/modules/system/templates/region.html.twig
@@ -14,14 +14,8 @@
  * @ingroup themeable
  */
 #}
-{%
-  set classes = [
-    'region',
-    'region-' ~ region|clean_class,
-  ]
-%}
 {% if content %}
-  <div{{ attributes.addClass(classes) }}>
+  <div{{ attributes }}>
     {{ content }}
   </div>
 {% endif %}
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 4c27d8f..aa11c0e 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -121,7 +121,7 @@
     <div id="main-wrapper" class="layout-main-wrapper layout-container clearfix">
       <div id="main" class="layout-main clearfix">
         {{ page.breadcrumb }}
-        <main id="content" class="column main-content" role="main">
+        <main id="content" class="column main-content js-quickedit" role="main">
           <section class="section">
             <a id="main-content" tabindex="-1"></a>
             {{ title_prefix }}
diff --git a/core/themes/classy/templates/layout/page.html.twig b/core/themes/classy/templates/layout/page.html.twig
index 8c81950..da565f1 100644
--- a/core/themes/classy/templates/layout/page.html.twig
+++ b/core/themes/classy/templates/layout/page.html.twig
@@ -94,7 +94,7 @@
 
   {{ page.help }}
 
-  <main role="main">
+  <main role="main" class="js-quickedit">
     <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
     <div class="layout-content">
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index ac26a51..d81c999 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -64,7 +64,7 @@
   <div class="layout-container">
     {{ page.pre_content }}
     {{ page.breadcrumb }}
-    <main class="page-content clearfix" role="main">
+    <main class="page-content clearfix js-quickedit" role="main">
       <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
       {{ page.highlighted }}
       {% if page.help %}