diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h
index 699b6213ed..60a0224f96 100644
--- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h
+++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h
@@ -81,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * @discussion Subclasses override this method to layout all subnodes or subviews.
  */
-- (void)layout;
+- (void)layout ASDISPLAYNODE_REQUIRES_SUPER;
 
 /**
  * @abstract Called on the main thread by the view's -layoutSubviews, after -layout.
diff --git a/AsyncDisplayKit/ASEditableTextNode.mm b/AsyncDisplayKit/ASEditableTextNode.mm
index c098e8729e..486f0eef38 100644
--- a/AsyncDisplayKit/ASEditableTextNode.mm
+++ b/AsyncDisplayKit/ASEditableTextNode.mm
@@ -186,6 +186,7 @@
 {
   ASDisplayNodeAssertMainThread();
 
+  [super layout];
   [self _layoutTextView];
 }