diff --git a/app/src/assets/scss/component/_tooltips.scss b/app/src/assets/scss/component/_tooltips.scss
index dbe2732a6..c1d6c2a58 100644
--- a/app/src/assets/scss/component/_tooltips.scss
+++ b/app/src/assets/scss/component/_tooltips.scss
@@ -15,6 +15,8 @@
   animation-duration: 150ms;
   animation-fill-mode: both;
   animation-name: zoomIn;
+  max-height: 90vh;
+  overflow: auto;
 
   a {
     color: var(--b3-theme-secondary);
diff --git a/app/src/constants.ts b/app/src/constants.ts
index a0adeaa06..a018ce078 100644
--- a/app/src/constants.ts
+++ b/app/src/constants.ts
@@ -41,7 +41,7 @@ export abstract class Constants {
 
     // size
     public static readonly SIZE_LINK_TEXT_MAX: number = 24;
-    public static readonly SIZE_TOOLBAR_HEIGHT: number = isMobile() ? 0 : 28;
+    public static readonly SIZE_TOOLBAR_HEIGHT: number = isMobile() ? 0 : 32;
     public static readonly SIZE_GET_MAX = 102400;
     public static readonly SIZE_UNDO = 64;
     public static readonly SIZE_TITLE = 512;