diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index e3707da8f..c5b5a1cbb 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -12,8 +12,8 @@ namespace Calculation {
 EditExpressionController::ContentView::ContentView(Responder * parentResponder, TableView * subview, TextFieldDelegate * textFieldDelegate, ExpressionLayoutFieldDelegate * expressionLayoutFieldDelegate) :
   View(),
   m_mainView(subview),
-  m_expressionField(parentResponder, m_textBody, k_bufferLength, m_layout, textFieldDelegate, expressionLayoutFieldDelegate),
-  m_layout(new Poincare::HorizontalLayout)
+  m_layout(new Poincare::HorizontalLayout()),
+  m_expressionField(parentResponder, m_textBody, k_bufferLength, m_layout, textFieldDelegate, expressionLayoutFieldDelegate)
 {
   m_textBody[0] = 0;
 }
diff --git a/apps/calculation/edit_expression_controller.h b/apps/calculation/edit_expression_controller.h
index 7334db33c..339cfbca6 100644
--- a/apps/calculation/edit_expression_controller.h
+++ b/apps/calculation/edit_expression_controller.h
@@ -52,9 +52,9 @@ private:
   private:
     static constexpr int k_bufferLength = TextField::maxBufferSize();
     TableView * m_mainView;
-    ExpressionField m_expressionField;
     char m_textBody[k_bufferLength];
     Poincare::ExpressionLayout * m_layout;
+    ExpressionField m_expressionField;
   };
   View * loadView() override;
   void unloadView(View * view) override;