diff --git a/modern/src/App.js b/modern/src/App.js
index a778c48c..d008aff8 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -174,6 +174,7 @@ function Container(props) {
   if (default_visible !== undefined) {
     style.display = default_visible ? "block" : "none";
   }
+
   return (
     <div data-node-type="container" data-node-id={id} style={style}>
       {children}
diff --git a/modern/src/runtime/Container.ts b/modern/src/runtime/Container.ts
index cb6c9bef..310ff7f7 100644
--- a/modern/src/runtime/Container.ts
+++ b/modern/src/runtime/Container.ts
@@ -96,7 +96,10 @@ class Container extends MakiObject {
 
   getcurlayout() {
     unimplementedWarning("getcurlayout");
-    return;
+    // TODO: For now we just always show the first layout. I think that's the default.
+    return this.children.find(childNode => {
+      return childNode.getclassname() === "Layout";
+    });
   }
 }