diff --git a/src/lib/components/common/Tooltip.svelte b/src/lib/components/common/Tooltip.svelte
index 738d06b9aa..3d1566e650 100644
--- a/src/lib/components/common/Tooltip.svelte
+++ b/src/lib/components/common/Tooltip.svelte
@@ -41,7 +41,7 @@
 					...(theme !== '' ? { theme } : { theme: 'dark' }),
 					arrow: false,
 					offset: offset,
-					interactive: interactive,
+					...(interactive ? { interactive: true } : {}),
 					...tippyOptions
 				});
 			}
diff --git a/src/lib/components/layout/Sidebar/ChatItem.svelte b/src/lib/components/layout/Sidebar/ChatItem.svelte
index 33cb95b0ac..6dd89bd8c1 100644
--- a/src/lib/components/layout/Sidebar/ChatItem.svelte
+++ b/src/lib/components/layout/Sidebar/ChatItem.svelte
@@ -332,9 +332,13 @@
 				disabled={generating}
 				on:keydown={chatTitleInputKeydownHandler}
 				on:blur={async (e) => {
+					// check if target is generate button
 					if (ignoreBlur) {
 						ignoreBlur = false;
 
+						if (e.relatedTarget?.id === 'generate-title-button') {
+							generateTitleHandler();
+						}
 						return;
 					}
 
@@ -440,13 +444,6 @@
 						on:mouseenter={() => {
 							ignoreBlur = true;
 						}}
-						on:click={(e) => {
-							e.preventDefault();
-							e.stopImmediatePropagation();
-							e.stopPropagation();
-
-							generateTitleHandler();
-						}}
 					>
 						<Sparkles strokeWidth="2" />
 					</button>