diff --git a/Widgets/NTooltip.qml b/Widgets/NTooltip.qml
index ea86090..168d7ee 100644
--- a/Widgets/NTooltip.qml
+++ b/Widgets/NTooltip.qml
@@ -29,11 +29,6 @@ Window {
     }
   }
 
-  onTextChanged: {
-    // Compute new dimensions everytime the text changes
-    _updateDimensions()
-  }
-
   function show() {
     isVisible = true
   }
@@ -42,16 +37,10 @@ Window {
     timerShow.running = false
   }
 
-  function _updateDimensions() {
+  function _showNow() {
     // Compute new size everytime we show the tooltip
     width = Math.max(50 * scaling, tooltipText.implicitWidth + Style.marginL * 2 * scaling)
     height = Math.max(40 * scaling, tooltipText.implicitHeight + Style.marginM * 2 * scaling)
-  }
-
-
-  function _showNow() {
-    // Compute new dimensions everytime we show the tooltip
-    _updateDimensions()
 
     if (!target) {
       return
@@ -120,6 +109,14 @@ Window {
       }
     }
   }
+  Connections {
+    target: root
+    function onTextChanged() {
+      if (root.visible) {
+        root._showNow()
+      }
+    }
+  }
 
   Timer {
     id: timerShow