diff --git a/dev/js/src/hint.js b/dev/js/src/hint.js
index e700b94..80262cc 100644
--- a/dev/js/src/hint.js
+++ b/dev/js/src/hint.js
@@ -138,6 +138,8 @@
       this._analyzer = analyzerClass.create(
         param["context"] || KorAP.context
       );
+
+      this.update();
       return this;
     },
 
diff --git a/dev/js/src/init.js b/dev/js/src/init.js
index a668b77..f98a3e6 100644
--- a/dev/js/src/init.js
+++ b/dev/js/src/init.js
@@ -271,7 +271,6 @@
       const header = document.querySelector('header');
       const main = document.querySelector('main');
       const footer = document.querySelector('footer');
-      const hint = document.querySelector('#hint');
       const results = document.querySelector('.found');
       const aside = document.querySelector('aside');
 
@@ -281,59 +280,24 @@
           main.classList.add('shifted');
         }
         footer.classList.add('shifted');
-        if (hint) {
-          hint.classList.add('shifted');
-          adjustHintPosition();
-        }
+        adjustHintPosition();
       } else {
         header.classList.remove('shifted');
         main.classList.remove('shifted');
         footer.classList.remove('shifted');
-        if (hint) {
-          hint.classList.remove('shifted');
-          adjustHintPosition();
-        }
+        adjustHintPosition();
       }
     }
     
-    // Function to adjust the position of the annotation assistant bar (hint), when user types into the searchbar and clicks the sidebar (or anywhere outside the searchbar) afterwards
+    // Function to adjust the position of the annotation assistant bar (hint),
+    // when user types into the searchbar and clicks the sidebar (or anywhere
+    // outside the searchbar) afterwards
     function adjustHintPosition() {
-      const hint = document.querySelector('#hint');
-      const searchInput = document.querySelector('#q-field');
-      const aside = document.querySelector('aside');
-
-      if (hint && searchInput) {
-        // Create a temporary span to measure the exact text width
-        const span = document.createElement('span');
-        span.style.visibility = 'hidden';
-        span.style.position = 'absolute';
-        span.style.whiteSpace = 'pre';
-        // Copy the input's font properties
-        const inputStyle = window.getComputedStyle(searchInput);
-        span.style.font = inputStyle.font;
-        span.style.fontSize = inputStyle.fontSize;
-        span.style.fontFamily = inputStyle.fontFamily;
-        span.textContent = searchInput.value;
-        document.body.appendChild(span);
-
-        // Get the actual width of the text
-        const inputWidth = searchInput.value.length > 0 ? span.offsetWidth : 0;
-        document.body.removeChild(span);
-        let hintLeftPosition = inputWidth;
-
-        // TODO: This shouldn't be a fixed position!
-        if (aside && aside.classList.contains('active')) {
-          hintLeftPosition += 230;
-        }
-        
-        hint.style.left = `${hintLeftPosition}px`;
-      }
-    }
-    //Can be solved more elegant witch ES6 (see optional chaining operator)
-    let qlf = document.querySelector('#q-field');
-      if(qlf != null){
-      qlf.addEventListener('blur', adjustHintPosition);
-    }
+      if (KorAP.Hint != undefined) {
+        KorAP.Hint.inputField().reposition();
+        KorAP.Hint.update();
+      };
+    };
  
     // MutationObserver to detect when #hint is injected into the DOM
     const observer = new MutationObserver((mutationsList, observer) => {
diff --git a/dev/scss/header/hint.scss b/dev/scss/header/hint.scss
index df85e25..11f0411 100644
--- a/dev/scss/header/hint.scss
+++ b/dev/scss/header/hint.scss
@@ -5,12 +5,6 @@
  * Rules for the Kalamar hint helper.
  */
 
-#hint {
-  &.shifted {
-    left: $logo-left-distance;
-  }
-}
-
 ul.menu.hint {
   display:     inline-block;
   white-space: normal;