diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index f46b16622..25075501f 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -85,7 +85,7 @@ bool EditExpressionController::layoutFieldDidReceiveEvent(::LayoutField * layout
   if (inputViewDidReceiveEvent(event, shouldDuplicateLastCalculation)) {
     return true;
   }
-  return app()->layoutFieldDidReceiveEvent(layoutField, event);
+  return expressionFieldDelegateApp()->layoutFieldDidReceiveEvent(layoutField, event);
 }
 
 bool EditExpressionController::layoutFieldDidFinishEditing(::LayoutField * layoutField, Layout layoutR, Ion::Events::Event event) {
diff --git a/apps/shared/layout_field_delegate.h b/apps/shared/layout_field_delegate.h
index 755c8c335..fb30f6afd 100644
--- a/apps/shared/layout_field_delegate.h
+++ b/apps/shared/layout_field_delegate.h
@@ -12,7 +12,7 @@ public:
   bool layoutFieldDidFinishEditing(LayoutField * layoutField, Poincare::Layout layoutR, Ion::Events::Event event) override;
   bool layoutFieldDidAbortEditing(LayoutField * layoutField) override;
   void layoutFieldDidChangeSize(LayoutField * layoutField) override;
-private:
+protected:
   ExpressionFieldDelegateApp * expressionFieldDelegateApp() const {
     return static_cast<ExpressionFieldDelegateApp *>(::app());
   }