diff --git a/surfsense_backend/app/agents/autocomplete/autocomplete_agent.py b/surfsense_backend/app/agents/autocomplete/autocomplete_agent.py
index 84f6a064d..77c0af5bb 100644
--- a/surfsense_backend/app/agents/autocomplete/autocomplete_agent.py
+++ b/surfsense_backend/app/agents/autocomplete/autocomplete_agent.py
@@ -401,6 +401,8 @@ async def stream_autocomplete_agent(
                     continue
                 output = event.get("data", {}).get("output")
                 if output and hasattr(output, "content"):
+                    if getattr(output, "tool_calls", None):
+                        continue
                     content = output.content
                     if content and isinstance(content, str) and not text_buffer:
                         text_buffer.append(content)
diff --git a/surfsense_web/app/desktop/suggestion/page.tsx b/surfsense_web/app/desktop/suggestion/page.tsx
index e98da9a1c..af1c50be0 100644
--- a/surfsense_web/app/desktop/suggestion/page.tsx
+++ b/surfsense_web/app/desktop/suggestion/page.tsx
@@ -274,7 +274,13 @@ export default function SuggestionPage() {
 
 	const TRUNCATE_LENGTH = 120;
 
-	if (options.length === 0) return null;
+	if (options.length === 0) {
+		return (
+			<div className="suggestion-tooltip suggestion-error">
+				<span className="suggestion-error-text">No suggestions available.</span>
+			</div>
+		);
+	}
 
 	return (
 		<div className="suggestion-tooltip">
@@ -288,11 +294,15 @@ export default function SuggestionPage() {
 							: option;
 
 					return (
-						<button
+						<div
 							key={index}
-							type="button"
+							role="button"
+							tabIndex={0}
 							className="suggestion-option"
 							onClick={() => handleSelect(option)}
+							onKeyDown={(e) => {
+								if (e.key === "Enter") handleSelect(option);
+							}}
 						>
 							<span className="option-number">{index + 1}</span>
 							<span className="option-text">{displayText}</span>
@@ -308,7 +318,7 @@ export default function SuggestionPage() {
 									{isExpanded ? "less" : "more"}
 								</button>
 							)}
-						</button>
+						</div>
 					);
 				})}
 			</div>