diff --git a/src/public/app/services/note_tooltip.js b/src/public/app/services/note_tooltip.js
index 77ec358d6..74c4d20ad 100644
--- a/src/public/app/services/note_tooltip.js
+++ b/src/public/app/services/note_tooltip.js
@@ -59,10 +59,11 @@ async function mouseEnterHandler() {
         $(this).tooltip({
             delay: {"show": 300, "hide": 100},
             container: 'body',
-            placement: 'auto',
+            // https://github.com/zadam/trilium/issues/2794 https://github.com/zadam/trilium/issues/2988
+            // with bottom this flickering happens a bit less
+            placement: 'bottom',
             trigger: 'manual',
             boundary: 'window',
-            offset: "0, 20", // workaround for https://github.com/zadam/trilium/issues/2794
             title: html,
             html: true,
             template: '<div class="tooltip note-tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',