diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index be107ae0623..c5b0b6474d4 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -218,18 +218,18 @@ footer {
 }
 
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
-.oe_structure:empty, [data-oe-type=html]:empty, .oe_structure > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
+.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
   background-image: url("/website/static/src/img/drag_here.png");
   background-repeat: no-repeat;
   background-position: center top;
   height: 200px !important;
 }
 
-.oe_structure > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
+.oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
   position: static;
 }
 
-.oe_structure:empty:before, [data-oe-type=html]:empty:before, .oe_structure > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before {
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before {
   content: "Drag Building Blocks Here";
   text-align: center;
   display: block;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index bef7a59e77d..8519292bf0a 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -147,16 +147,16 @@ footer
 
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
-.oe_structure:empty, [data-oe-type=html]:empty, .oe_structure > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
+.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
     background-image: url('/website/static/src/img/drag_here.png')
     background-repeat: no-repeat
     background-position: center top
     height: 200px !important
 
-.oe_structure > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
+.oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
     position: static
 
-.oe_structure:empty:before, [data-oe-type=html]:empty:before, .oe_structure > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
     content: 'Drag Building Blocks Here'
     text-align: center
     display: block
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 93365a5d938..08415623421 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -187,13 +187,13 @@
 
         <template id="homepage" name="Homepage" page="True">
             <t t-call="website.layout">
-              <div id="wrap" class="oe_structure"></div>
+              <div id="wrap" class="oe_structure oe_empty"></div>
             </t>
         </template>
 
         <template id="default_page">
             <t t-call="website.layout">
-              <div id="wrap" class="oe_structure"></div>
+              <div id="wrap" class="oe_structure oe_empty"></div>
             </t>
         </template>
 
@@ -210,7 +210,7 @@
                     <div class="text-center text-muted">Edit the content bellow this line to adapt the default "page not found" page.</div>
                 </div>
                 <hr />
-                <div class="oe_structure">
+                <div class="oe_structure oe_empty">
                     <div class="container">
                         <h1 class="mt32">404: Page not found!</h1>
                         <p>
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 5b5542f4c4e..bed587b60b0 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -17,7 +17,7 @@
         <t t-call="website.layout">
           <t t-set="title">Partners</t>
           <div id="wrap">
-            <div class="oe_structure"> </div>
+            <div class="oe_structure"/>
             <div class="container">
                 <div class="row">
                     <t t-raw="ref_content" />
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
index 404bfd39764..611a3610d96 100644
--- a/addons/website_membership/views/website_membership.xml
+++ b/addons/website_membership/views/website_membership.xml
@@ -17,13 +17,13 @@
         <t t-call="website.layout">
             <t t-set="title">Partners</t>
             <div id="wrap">
-                <div class="oe_structure"> </div>
+                <div class="oe_structure"/>
                 <div class="container">
                     <div class="row">
                         <t t-raw="ref_content" />
                     </div>
                 </div>
-                <div class="oe_structure"> </div>
+                <div class="oe_structure"/>
             </div>
         </t>
     </template>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index e85922dcc7f..450cf2d7749 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -75,7 +75,7 @@
             </t>
             <t t-set="title">Shop - <t t-raw="title">Categories</t></t>
             <div id="wrap">
-              <div class="oe_structure"> </div>
+              <div class="oe_structure"/>
               <div class="container oe_website_sale">
                   <div class="row">
                       <div class="col-md-12" id="shop_content">