diff --git a/apps/code/python_toolbox.h b/apps/code/python_toolbox.h
index 0889f2ebf..d3e9d7f21 100644
--- a/apps/code/python_toolbox.h
+++ b/apps/code/python_toolbox.h
@@ -12,10 +12,10 @@ class PythonToolbox : public Toolbox {
 public:
   PythonToolbox();
   bool handleEvent(Ion::Events::Event event) override;
+  const ToolboxMessageTree * rootModel() const override;
 protected:
   KDCoordinate rowHeight(int j) override;
   bool selectLeaf(int selectedRow) override;
-  const ToolboxMessageTree * rootModel() const override;
   MessageTableCellWithMessage * leafCellAtIndex(int index) override;
   MessageTableCellWithChevron* nodeCellAtIndex(int index) override;
   int maxNumberOfDisplayedRows() override;
diff --git a/apps/math_toolbox.h b/apps/math_toolbox.h
index 77bc6bd56..d0301efc0 100644
--- a/apps/math_toolbox.h
+++ b/apps/math_toolbox.h
@@ -7,9 +7,9 @@
 class MathToolbox : public Toolbox {
 public:
   MathToolbox();
+  const ToolboxMessageTree * rootModel() const override;
 protected:
   bool selectLeaf(int selectedRow) override;
-  const ToolboxMessageTree * rootModel() const override;
   MessageTableCellWithMessage * leafCellAtIndex(int index) override;
   MessageTableCellWithChevron* nodeCellAtIndex(int index) override;
   int maxNumberOfDisplayedRows() override;
diff --git a/escher/include/escher/toolbox.h b/escher/include/escher/toolbox.h
index 7737c1369..da8e5d4f6 100644
--- a/escher/include/escher/toolbox.h
+++ b/escher/include/escher/toolbox.h
@@ -18,13 +18,13 @@ public:
   int reusableCellCount(int type) override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
   int typeAtLocation(int i, int j) override;
+  virtual const ToolboxMessageTree * rootModel() const = 0;
 
 protected:
   constexpr static int k_maxMessageSize = 100;
   bool selectSubMenu(int selectedRow) override;
   bool returnToPreviousMenu() override;
   virtual int maxNumberOfDisplayedRows() = 0;
-  virtual const ToolboxMessageTree * rootModel() const = 0;
   virtual MessageTableCellWithMessage * leafCellAtIndex(int index) override = 0;
   virtual MessageTableCellWithChevron * nodeCellAtIndex(int index) override = 0;
   mutable ToolboxMessageTree * m_messageTreeModel;