diff --git a/escher/src/layout_field.cpp b/escher/src/layout_field.cpp
index 6df1de2f0..52f457e46 100644
--- a/escher/src/layout_field.cpp
+++ b/escher/src/layout_field.cpp
@@ -43,7 +43,9 @@ bool LayoutField::ContentView::setEditing(bool isEditing) {
 
 void LayoutField::ContentView::useInsertionCursor() {
   if (m_insertionCursor.isDefined()) {
+    m_cursor.layout().removeGreySquaresFromAllMatrixAncestors();
     m_cursor = m_insertionCursor;
+    m_cursor.layout().addGreySquaresToAllMatrixAncestors();
   }
 }
 
diff --git a/poincare/include/poincare/empty_layout.h b/poincare/include/poincare/empty_layout.h
index 14cd3bb15..8edb9c538 100644
--- a/poincare/include/poincare/empty_layout.h
+++ b/poincare/include/poincare/empty_layout.h
@@ -82,6 +82,7 @@ public:
     node()->setVisible(visible);
   }
 
+  EmptyLayoutNode::Color color() const { return node()->color(); }
   void setColor(EmptyLayoutNode::Color color) {
     node()->setColor(color);
   }