diff --git a/src/components/graph/NodeTooltip.vue b/src/components/graph/NodeTooltip.vue
index fd3015bdd..5a3b97d9f 100644
--- a/src/components/graph/NodeTooltip.vue
+++ b/src/components/graph/NodeTooltip.vue
@@ -15,6 +15,7 @@ import { LiteGraph } from '@comfyorg/litegraph'
 import { app as comfyApp } from '@/scripts/app'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useEventListener } from '@vueuse/core'
+import { selectDocItem } from '@/components/sidebar/tabs/DocumentationSidebarTab.vue'
 
 let idleTimeout: number
 const nodeDefStore = useNodeDefStore()
@@ -85,7 +86,7 @@ const onIdle = () => {
     ctor.title_mode !== LiteGraph.NO_TITLE &&
     canvas.graph_mouse[1] < node.pos[1] // If we are over a node, but not within the node then we are on its title
   ) {
-    if (comfyApp?.tooltipCallback?.(node, 'DESCRIPTION')) {
+    if (selectDocItem(node, 'DESCRIPTION')) {
       return
     } else if (Array.isArray(nodeDef.description)) {
       return showTooltip(nodeDef.description[0])
@@ -103,7 +104,7 @@ const onIdle = () => {
   )
   if (inputSlot !== -1) {
     const inputName = node.inputs[inputSlot].name
-    if (!comfyApp?.tooltipCallback?.(node, inputName)) {
+    if (selectDocItem(node, inputName)) {
       return showTooltip(nodeDef.input.getInput(inputName)?.tooltip)
     }
   }
@@ -116,7 +117,7 @@ const onIdle = () => {
   )
   if (outputSlot !== -1) {
     const outputDef = nodeDef.output.all?.[outputSlot]
-    if (!comfyApp?.tooltipCallback?.(node, outputDef?.name)) {
+    if (selectDocItem(node, outputDef?.name)) {
       return showTooltip(outputDef?.tooltip)
     }
   }
@@ -124,7 +125,7 @@ const onIdle = () => {
   const widget = getHoveredWidget()
   // Dont show for DOM widgets, these use native browser tooltips as we dont get proper mouse events on these
   if (widget && !widget.element) {
-    if (!comfyApp?.tooltipCallback?.(node, widget.name, widget.value)) {
+    if (selectDocItem(node, widget.name, widget.value)) {
       return showTooltip(
         widget.tooltip ?? nodeDef.input.getInput(widget.name)?.tooltip
       )
diff --git a/src/components/sidebar/tabs/DocumentationSidebarTab.vue b/src/components/sidebar/tabs/DocumentationSidebarTab.vue
index a92f044dd..649044a05 100644
--- a/src/components/sidebar/tabs/DocumentationSidebarTab.vue
+++ b/src/components/sidebar/tabs/DocumentationSidebarTab.vue
@@ -27,22 +27,24 @@
     </div>
   </div>
 </template>
-
-<script setup lang="ts">
-import { ref, watch } from 'vue'
-import { DocItem } from 'DocItems'
+<script lang="ts">
+import { ref, watchEffect } from 'vue'
 import { app } from '@/scripts/app'
+var docElement = ref(null)
 
 let def
 const inputs = ref([])
 const outputs = ref([])
-const docElement = ref(null)
 
-function hasInputDoc() {
-  return !!inputs.value.length
-}
-function hasAnyDoc() {
-  return def?.description || inputs.value.length || outputs.value.length
+export function selectDocItem(node, name, value) {
+  if (node != app?.canvas?.current_node || name == 'DESCRIPTION') {
+    return false
+  }
+  if (node != app?.canvas?.current_node || name == 'DESCRIPTION') {
+    return false
+  }
+  selectHelp(name, value)
+  return true
 }
 function setCollapse(el, doCollapse) {
   if (doCollapse) {
@@ -126,17 +128,9 @@ function selectHelp(name: string, value?: string) {
     }
   }
 }
-app.tooltipCallback = function (node, name, value) {
-  if (node != app.canvas.current_node || name == 'DESCRIPTION') {
-    return false
-  }
-  selectHelp(name, value)
-  return true
-}
-
 function updateNode(node?) {
   console.log('updating node')
-  node ||= app.canvas.current_node
+  node ||= app?.canvas?.current_node
   if (!node) {
     // Graph has no nodes
     return
@@ -165,14 +159,19 @@ function updateNode(node?) {
     outputs.value = []
   }
 }
-watch(
-  () => app.canvas.current_node,
-  (node) => {
-    console.log('watched')
-    updateNode(ndoe)
-  }
-)
+watchEffect(() => app?.canvas?.current_node, updateNode)
 updateNode()
+function hasInputDoc() {
+  return !!inputs.value.length
+}
+function hasAnyDoc() {
+  return def?.description || inputs.value.length || outputs.value.length
+}
+export default {
+  setup() {
+    return { hasInputDoc, hasAnyDoc, inputs, outputs, def }
+  }
+}
 </script>
 
 <style scoped>