diff --git a/poincare/src/layout.cpp b/poincare/src/layout.cpp
index 610dc5bf1..a59c6a1c4 100644
--- a/poincare/src/layout.cpp
+++ b/poincare/src/layout.cpp
@@ -286,6 +286,7 @@ void Layout::collapseSiblings(LayoutCursor * cursor) {
   Layout rootLayout = root();
   if (node()->shouldCollapseSiblingsOnRight()) {
     Layout absorbingChild = childAtIndex(rightCollapsingAbsorbingChildIndex());
+    // TODO: add a horizontal layout only if several siblings.
     if (absorbingChild.type() != LayoutNode::Type::HorizontalLayout) {
       Layout horRef = HorizontalLayout::Builder();
       replaceChild(absorbingChild, horRef, cursor, true);
diff --git a/poincare/src/layout_cursor.cpp b/poincare/src/layout_cursor.cpp
index f9d9320a2..7ed3747bf 100644
--- a/poincare/src/layout_cursor.cpp
+++ b/poincare/src/layout_cursor.cpp
@@ -95,6 +95,7 @@ void LayoutCursor::addEmptyMatrixLayout() {
 }
 
 void LayoutCursor::addEmptySquareRootLayout() {
+  // TODO: add a horizontal layout only if several children
   HorizontalLayout child1 = HorizontalLayout::Builder(EmptyLayout::Builder());
   NthRootLayout newChild = NthRootLayout::Builder(child1);
   m_layout.addSibling(this, newChild, false);