diff --git a/apps/app/src/components/common/InfoTooltip.vue b/apps/app/src/components/common/InfoTooltip.vue
index d765d558..c53d5121 100644
--- a/apps/app/src/components/common/InfoTooltip.vue
+++ b/apps/app/src/components/common/InfoTooltip.vue
@@ -1,20 +1,30 @@
 <template>
-  <VTooltip
-    location="bottom"
-    max-width="320"
-    open-on-click
+  <VMenu
+    :close-on-content-click="false"
+    location="bottom start"
+    max-width="340"
+    offset="8"
   >
-    <template #activator="{ props: tooltipProps }">
+    <template #activator="{ props: menuProps }">
       <VIcon
-        v-bind="tooltipProps"
+        v-bind="menuProps"
         icon="tabler-info-circle"
         size="16"
         color="medium-emphasis"
-        class="cursor-help"
+        class="cursor-pointer"
       />
     </template>
-    <div class="text-body-2">
-      <slot />
-    </div>
-  </VTooltip>
+
+    <VCard
+      variant="elevated"
+      class="pa-3"
+    >
+      <div
+        class="text-body-2"
+        style="line-height: 1.6;"
+      >
+        <slot />
+      </div>
+    </VCard>
+  </VMenu>
 </template>
diff --git a/apps/app/src/components/sections/CreateShiftDialog.vue b/apps/app/src/components/sections/CreateShiftDialog.vue
index 383d3309..5498aba5 100644
--- a/apps/app/src/components/sections/CreateShiftDialog.vue
+++ b/apps/app/src/components/sections/CreateShiftDialog.vue
@@ -250,7 +250,10 @@ function onSubmit() {
                 >
                   <InfoTooltip>
                     <p>{{ tooltipText?.main }}</p>
-                    <div class="mt-2 pa-2 bg-surface rounded text-caption">
+                    <div
+                      class="mt-2 pa-2 rounded text-caption"
+                      style="background: rgb(var(--v-theme-surface-variant)); line-height: 1.5;"
+                    >
                       <strong>Tip:</strong> {{ tooltipText?.tip }}
                     </div>
                   </InfoTooltip>