diff --git a/apps/graph/app.cpp b/apps/graph/app.cpp
index e22c666ec..4535a4241 100644
--- a/apps/graph/app.cpp
+++ b/apps/graph/app.cpp
@@ -18,7 +18,7 @@ App::App(Container * container, Context * context) :
   m_valuesHeader(HeaderViewController(&m_valuesAlternateEmptyViewController, &m_valuesController, &m_valuesController)),
   m_valuesAlternateEmptyViewController(AlternateEmptyViewController(nullptr, &m_valuesHeader, &m_valuesController)),
   m_valuesStackViewController(StackViewController(&m_tabViewController, &m_valuesAlternateEmptyViewController)),
-  m_tabViewController(&m_inputViewController, 3, &m_listStackViewController, &m_graphStackViewController, &m_valuesStackViewController),
+  m_tabViewController(&m_inputViewController, &m_listStackViewController, &m_graphStackViewController, &m_valuesStackViewController),
   m_inputViewController(&m_modalViewController, &m_tabViewController, this)
 {
 }
diff --git a/apps/statistics/app.cpp b/apps/statistics/app.cpp
index 0f67c1eb6..d75fd0dfc 100644
--- a/apps/statistics/app.cpp
+++ b/apps/statistics/app.cpp
@@ -16,7 +16,7 @@ App::App(Container * container) :
   m_histogramStackViewController(StackViewController(&m_tabViewController, &m_histogramAlternateEmptyViewController)),
   m_dataController(nullptr, &m_data),
   m_dataStackViewController(StackViewController(&m_tabViewController, &m_dataController)),
-  m_tabViewController(&m_modalViewController, 4, &m_dataStackViewController, &m_histogramStackViewController, &m_boxAlternateEmptyViewController, &m_calculationAlternateEmptyViewController)
+  m_tabViewController(&m_modalViewController, &m_dataStackViewController, &m_histogramStackViewController, &m_boxAlternateEmptyViewController, &m_calculationAlternateEmptyViewController)
 {
 }
 
diff --git a/escher/include/escher/tab_view_controller.h b/escher/include/escher/tab_view_controller.h
index ef0e3eff1..93f7263f5 100644
--- a/escher/include/escher/tab_view_controller.h
+++ b/escher/include/escher/tab_view_controller.h
@@ -6,7 +6,7 @@
 
 class TabViewController : public ViewController {
 public:
-  TabViewController(Responder * parentResponder, uint8_t numberOfChildren, ViewController * one, ViewController * two, ViewController * three, ViewController * four = nullptr);
+  TabViewController(Responder * parentResponder, ViewController * one, ViewController * two, ViewController * three, ViewController * four = nullptr);
   View * view() override;
 
   void setSelectedTab(int8_t index);
diff --git a/escher/src/tab_view_controller.cpp b/escher/src/tab_view_controller.cpp
index c4198ba39..117c3a587 100644
--- a/escher/src/tab_view_controller.cpp
+++ b/escher/src/tab_view_controller.cpp
@@ -53,9 +53,8 @@ const char * TabViewController::ContentView::className() const {
 }
 #endif
 
-TabViewController::TabViewController(Responder * parentResponder, uint8_t numberOfChildren, ViewController * one, ViewController * two, ViewController * three, ViewController * four) :
+TabViewController::TabViewController(Responder * parentResponder, ViewController * one, ViewController * two, ViewController * three, ViewController * four) :
   ViewController(parentResponder),
-  m_numberOfChildren(numberOfChildren),
   m_activeChildIndex(-1),
   m_selectedChildIndex(-1)
 {
@@ -64,8 +63,10 @@ TabViewController::TabViewController(Responder * parentResponder, uint8_t number
   m_children[2] = three;
   m_children[3] = four;
 
-  for (int i=0; i<numberOfChildren; i++) {
-    m_children[i]->setParentResponder(this);
+  for (int i = 0; i < k_maxNumberOfChildren; i++) {
+    if (m_children[i] != nullptr) {
+      m_numberOfChildren ++;
+    }
   }
 }