diff --git a/src/public/app/widgets/attribute_list.js b/src/public/app/widgets/attribute_list.js
index ee5a4763e..bb676a05f 100644
--- a/src/public/app/widgets/attribute_list.js
+++ b/src/public/app/widgets/attribute_list.js
@@ -174,6 +174,7 @@ export default class AttributeListWidget extends TabAwareWidget {
                 this.$inheritedAttributesWrapper.hide();
             } else {
                 this.$promotedExpander.hide();
+                this.$allAttrWrapper.show();
                 this.$ownedAndInheritedWrapper.toggle(options.is('attributeListExpanded'));
             }
         }
diff --git a/src/public/app/widgets/promoted_attributes.js b/src/public/app/widgets/promoted_attributes.js
index b12e5d960..c5128459d 100644
--- a/src/public/app/widgets/promoted_attributes.js
+++ b/src/public/app/widgets/promoted_attributes.js
@@ -37,6 +37,7 @@ const TPL = `
 export default class PromotedAttributesWidget extends TabAwareWidget {
     doRender() {
         this.$widget = $(TPL);
+        this.overflowing();
         this.$container = this.$widget.find(".promoted-attributes-container");
     }