diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index 93f3b906a..2a3a9ee27 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -1,7 +1,8 @@
 #include "edit_expression_controller.h"
-#include "../apps_container.h"
-#include "ion/display.h"
 #include "app.h"
+#include "../apps_container.h"
+#include <ion/display.h>
+#include <poincare/preferences.h>
 #include <assert.h>
 
 using namespace Shared;
@@ -65,6 +66,10 @@ void EditExpressionController::ContentView::drawRect(KDContext * ctx, KDRect rec
   }
 }
 
+bool EditExpressionController::ContentView::editionIsInTextField() const {
+  return Poincare::Preferences::sharedPreferences()->editionMode() == Poincare::Preferences::EditionMode::Edition1D;
+}
+
 KDCoordinate EditExpressionController::ContentView::inputViewHeight() const {
   return  k_verticalMargin + (editionIsInTextField() ? k_textFieldHeight : editableExpressionViewHeight());
 }
diff --git a/apps/calculation/edit_expression_controller.h b/apps/calculation/edit_expression_controller.h
index a28d36a41..54d0512da 100644
--- a/apps/calculation/edit_expression_controller.h
+++ b/apps/calculation/edit_expression_controller.h
@@ -45,7 +45,7 @@ private:
     EditableExpressionView * editableExpressionView() { return &m_editableExpressionView; }
     TableView * mainView()  { return m_mainView; }
     void drawRect(KDContext * ctx, KDRect rect) const override;
-    bool editionIsInTextField() const { return true; } //TODO
+    bool editionIsInTextField() const;
     static constexpr int k_bufferLength = TextField::maxBufferSize();
   private:
     static constexpr KDCoordinate k_textFieldHeight = 32;