diff --git a/apps/interactive_curve_view_controller.cpp b/apps/interactive_curve_view_controller.cpp
index 0aa258262..72f60258b 100644
--- a/apps/interactive_curve_view_controller.cpp
+++ b/apps/interactive_curve_view_controller.cpp
@@ -105,8 +105,6 @@ void InteractiveCurveViewController::didBecomeFirstResponder() {
   }
   headerViewController()->setSelectedButton(-1);
   curveView()->selectMainView(true);
-  // Layout view whe the graph view that might have been modified by the zoom page
-  headerViewController()->layoutView();
   // Reload graph view
   curveView()->reload();
   reloadBannerView();
diff --git a/escher/include/escher/header_view_controller.h b/escher/include/escher/header_view_controller.h
index e8707bf0f..73fb8d94b 100644
--- a/escher/include/escher/header_view_controller.h
+++ b/escher/include/escher/header_view_controller.h
@@ -16,7 +16,6 @@ public:
   void didBecomeFirstResponder() override;
   bool handleEvent(Ion::Events::Event event) override;
   bool setSelectedButton(int selectedButton);
-  void layoutView();
 private:
   class ContentView : public View {
   public:
diff --git a/escher/src/header_view_controller.cpp b/escher/src/header_view_controller.cpp
index e1f3e90f2..bb78530f2 100644
--- a/escher/src/header_view_controller.cpp
+++ b/escher/src/header_view_controller.cpp
@@ -104,6 +104,7 @@ const char * HeaderViewController::title() const {
 }
 
 void HeaderViewController::didBecomeFirstResponder(){
+  m_contentView.layoutSubviews();
   app()->setFirstResponder(m_contentView.mainViewController());
 }
 
@@ -132,7 +133,3 @@ bool HeaderViewController::handleEvent(Ion::Events::Event event) {
   }
   return false;
 }
-
-void HeaderViewController::layoutView() {
-  m_contentView.layoutSubviews();
-}
\ No newline at end of file