diff --git a/apps/node_navigation_controller.h b/apps/node_navigation_controller.h
index 7769fb4b9..ba96e9447 100644
--- a/apps/node_navigation_controller.h
+++ b/apps/node_navigation_controller.h
@@ -14,6 +14,7 @@ public:
   void setTextFieldCaller(TextField * textField);
 protected:
   TextField * m_textFieldCaller;
+  NodeListViewController m_listViewController;
 private:
   class Stack {
   public:
@@ -40,7 +41,6 @@ private:
   virtual bool selectLeaf(Node * selectedNode) = 0;
   bool selectSubMenu(Node * selectedNode);
   bool returnToPreviousMenu();
-  NodeListViewController m_listViewController;
   Stack m_stack;
 };
 
diff --git a/apps/tool_box_controller.cpp b/apps/tool_box_controller.cpp
index 89a149efa..a1daee920 100644
--- a/apps/tool_box_controller.cpp
+++ b/apps/tool_box_controller.cpp
@@ -31,6 +31,7 @@ Node * ToolBoxController::nodeModel() {
 }
 
 bool ToolBoxController::selectLeaf(Node * selectedNode){
+  m_listViewController.deselectTable();
   ToolBoxNode * node = (ToolBoxNode *)selectedNode;
   const char * editedText = node->text();
   m_textFieldCaller->appendText(editedText);