diff --git a/ui/desktop/src/components/BaseChat.tsx b/ui/desktop/src/components/BaseChat.tsx
index 67e38830..7e6057fb 100644
--- a/ui/desktop/src/components/BaseChat.tsx
+++ b/ui/desktop/src/components/BaseChat.tsx
@@ -402,7 +402,15 @@ function BaseChatContent({
                 <div className="block h-8" />
               </>
             ) : !recipe && showPopularTopics ? (
-              <PopularChatTopics append={(text: string) => handleSubmit(text)} />
+              <PopularChatTopics
+                append={(text: string) => {
+                  const syntheticEvent = {
+                    detail: { value: text },
+                    preventDefault: () => {},
+                  } as unknown as React.FormEvent;
+                  handleFormSubmit(syntheticEvent);
+                }}
+              />
             ) : null}
           </ScrollArea>