diff --git a/src/ui/zabapgit_css_common.w3mi.data.css b/src/ui/zabapgit_css_common.w3mi.data.css
index 6f65b43ac..bc809b8ec 100644
--- a/src/ui/zabapgit_css_common.w3mi.data.css
+++ b/src/ui/zabapgit_css_common.w3mi.data.css
@@ -727,10 +727,17 @@ div.message-panel:hover .message-panel-commands {
     /* Position the tooltip text */
     position: absolute;
     z-index: 1;
-    margin-left: -60px;
     margin-top: -30px;
 }
 
+.link-hint-a {
+  margin-left: -60px;
+}
+
+.link-hint-input {
+  margin-left: -30px;
+}
+
 .link-hint .pending { color: hsla(0, 0%, 0%, 0.2); }
 
 /* Tooltip arrow */
diff --git a/src/ui/zabapgit_js_common.w3mi.data.js b/src/ui/zabapgit_js_common.w3mi.data.js
index c19c8f31a..0bb91c967 100644
--- a/src/ui/zabapgit_js_common.w3mi.data.js
+++ b/src/ui/zabapgit_js_common.w3mi.data.js
@@ -786,6 +786,12 @@ LinkHints.prototype.deployHintContainers = function() {
 
     hint.pendingSpan.classList.add("pending");
     hint.container.classList.add("link-hint");
+    if (hint.parent.nodeName === "INPUT"){
+      hint.container.classList.add("link-hint-input");
+    } else {
+      hint.container.classList.add("link-hint-a");
+    }
+
     hint.container.classList.add("nodisplay");            // hide by default
     hint.container.dataset.code = codeCounter.toString(); // not really needed, more for debug