diff --git a/apps/code/editor_controller.cpp b/apps/code/editor_controller.cpp
index 6f9e4df2a..b07470d88 100644
--- a/apps/code/editor_controller.cpp
+++ b/apps/code/editor_controller.cpp
@@ -114,10 +114,6 @@ VariableBoxController * EditorController::variableBoxForInputEventHandler(InputE
   return varBox;
 }
 
-InputEventHandlerDelegateApp * EditorController::inputEventHandlerDelegateApp() {
-  return app();
-}
-
 StackViewController * EditorController::stackController() {
   return static_cast<StackViewController *>(parentResponder());
 }
diff --git a/apps/code/editor_controller.h b/apps/code/editor_controller.h
index 93e3adb60..7020ad14f 100644
--- a/apps/code/editor_controller.h
+++ b/apps/code/editor_controller.h
@@ -33,7 +33,6 @@ public:
   VariableBoxController * variableBoxForInputEventHandler(InputEventHandler * textInput) override;
 
 private:
-  Shared::InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() override;
   static constexpr int k_indentationSpacesNumber = 2; //TODO LEA merge with text area k_indentationSpaces
   StackViewController * stackController();
   void saveScript();
diff --git a/apps/sequence/list/list_controller.cpp b/apps/sequence/list/list_controller.cpp
index a066517f3..a884590e0 100644
--- a/apps/sequence/list/list_controller.cpp
+++ b/apps/sequence/list/list_controller.cpp
@@ -166,10 +166,6 @@ ExpressionFieldDelegateApp * ListController::expressionFieldDelegateApp() {
   return app();
 }
 
-InputEventHandlerDelegateApp * ListController::inputEventHandlerDelegateApp() {
-  return app();
-}
-
 ListParameterController * ListController::parameterController() {
   return &m_parameterController;
 }
diff --git a/apps/sequence/list/list_controller.h b/apps/sequence/list/list_controller.h
index e7b639471..7d564ce9c 100644
--- a/apps/sequence/list/list_controller.h
+++ b/apps/sequence/list/list_controller.h
@@ -30,7 +30,6 @@ private:
   bool editInitialConditionOfSelectedRecordWithText(const char * text, bool firstInitialCondition);
   Shared::TextFieldDelegateApp * textFieldDelegateApp() override;
   Shared::ExpressionFieldDelegateApp * expressionFieldDelegateApp() override;
-  Shared::InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() override;
   ListParameterController * parameterController() override;
   int maxNumberOfDisplayableRows() override;
   Shared::FunctionTitleCell * titleCells(int index) override;
diff --git a/apps/shared/input_event_handler_delegate.h b/apps/shared/input_event_handler_delegate.h
index 3fadd27fe..1382921d9 100644
--- a/apps/shared/input_event_handler_delegate.h
+++ b/apps/shared/input_event_handler_delegate.h
@@ -1,7 +1,6 @@
 #ifndef SHARED_INPUT_EVENT_HANDLER_DELEGATE_H
 #define SHARED_INPUT_EVENT_HANDLER_DELEGATE_H
 
-#include <escher.h>
 #include "input_event_handler_delegate_app.h"
 
 namespace Shared {
@@ -11,7 +10,9 @@ public:
   Toolbox * toolboxForInputEventHandler(InputEventHandler * textInput) override { return inputEventHandlerDelegateApp()->toolboxForInputEventHandler(textInput); }
   NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override { return inputEventHandlerDelegateApp()->variableBoxForInputEventHandler(textInput); }
 private:
-  virtual InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() = 0;
+  InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() {
+    return static_cast<InputEventHandlerDelegateApp *>(::app());
+  }
 };
 
 }
diff --git a/apps/shared/input_event_handler_delegate_app.h b/apps/shared/input_event_handler_delegate_app.h
index 3f2927c9c..0339738c0 100644
--- a/apps/shared/input_event_handler_delegate_app.h
+++ b/apps/shared/input_event_handler_delegate_app.h
@@ -1,7 +1,8 @@
 #ifndef SHARED_INPUT_EVENT_HANDLER_DELEGATE_APP_H
 #define SHARED_INPUT_EVENT_HANDLER_DELEGATE_APP_H
 
-#include <escher.h>
+#include <escher/app.h>
+#include <escher/input_event_handler_delegate.h>
 
 namespace Shared {