diff --git a/app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx b/app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx
index a2e04e7..b9d98c1 100644
--- a/app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx
+++ b/app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx
@@ -63,7 +63,7 @@ function TreeNodeSubnodes(props: Props) {
     })
 
     return <span className={props.classes.list}>{listItems}</span>
-  }, [alreadyAdded, props.treeNode.lastUpdate, props.theme])
+  }, [alreadyAdded, props.treeNode.lastUpdate, props.theme, props.settings])
 }
 
 const styles = (theme: Theme) => ({
diff --git a/app/src/components/Tree/TreeNode/index.tsx b/app/src/components/Tree/TreeNode/index.tsx
index 5d15f83..1a67cd5 100644
--- a/app/src/components/Tree/TreeNode/index.tsx
+++ b/app/src/components/Tree/TreeNode/index.tsx
@@ -11,7 +11,7 @@ import { useAnimationToIndicateTopicUpdate } from './effects/useAnimationToIndic
 import { useDeleteKeyCallback } from './effects/useDeleteKeyCallback'
 import { useIsAllowedToAutoExpandState } from './effects/useIsAllowedToAutoExpandState'
 import { useViewModelSubscriptions } from './effects/useViewModelSubscriptions'
-import { useSelectionState } from './useSelectionState'
+import { useSelectionState } from './effects/useSelectionState'
 
 export interface Props {
   isRoot?: boolean
@@ -86,7 +86,7 @@ function TreeNodeComponent(props: Props) {
         didSelectTopic()
       }
     },
-    [didSelectTopic]
+    [didSelectTopic, settings]
   )
 
   useEffect(() => {
@@ -134,7 +134,7 @@ function TreeNodeComponent(props: Props) {
         {renderNodes()}
       </div>
     )
-  }, [treeNode.lastUpdate, treeNode, name, isCollapsed, selected, theme])
+  }, [treeNode.lastUpdate, treeNode, name, isCollapsed, selected, theme, mouseOver, settings])
 }
 
 class TreeNodeComponentFasterReconciliationWrapper extends React.PureComponent<Props, {}> {