diff --git a/lib/modules/apostrophe-areas/public/js/editor.js b/lib/modules/apostrophe-areas/public/js/editor.js
index <HASH>..<HASH> 100644
--- a/lib/modules/apostrophe-areas/public/js/editor.js
+++ b/lib/modules/apostrophe-areas/public/js/editor.js
@@ -369,7 +369,7 @@ apos.define('apostrophe-area-editor', {
     };
 
     self.enhanceWidgetControls = function($widget) {
-      $controls = $widget.find('[data-apos-widget-controls]');
+      $controls = $widget.findSafe('[data-apos-widget-controls]', '[data-area]');
       if (self.options.limit == 1) {
         $controls.addClass('apos-limit-one')
       }
Fix issue where 'apos-limit-one' class would be applied to all nested widget controls, even if it wasn't true.