diff --git a/front/components/assistant/conversation/ConversationContainer.tsx b/front/components/assistant/conversation/ConversationContainer.tsx
index e6a3589c6e90..e1964b80a022 100644
--- a/front/components/assistant/conversation/ConversationContainer.tsx
+++ b/front/components/assistant/conversation/ConversationContainer.tsx
@@ -22,7 +22,6 @@ import {
 import { ReachedLimitPopup } from "@app/components/app/ReachedLimitPopup";
 import { AssistantBrowserContainer } from "@app/components/assistant/conversation/AssistantBrowserContainer";
 import ConversationViewer from "@app/components/assistant/conversation/ConversationViewer";
-import { HelpAndQuickGuideWrapper } from "@app/components/assistant/conversation/HelpAndQuickGuideWrapper";
 import { FixedAssistantInputBar } from "@app/components/assistant/conversation/input_bar/InputBar";
 import { InputBarContext } from "@app/components/assistant/conversation/input_bar/InputBarContext";
 import {
@@ -320,10 +319,6 @@ export function ConversationContainer({
         />
       </Transition>
 
-      {activeConversationId !== "new" && (
-        <HelpAndQuickGuideWrapper owner={owner} user={user} />
-      )}
-
       <ReachedLimitPopup
         isOpened={planLimitReached}
         onClose={() => setPlanLimitReached(false)}
diff --git a/front/components/sparkle/AppLayout.tsx b/front/components/sparkle/AppLayout.tsx
index 5ed4c58f64d2..19a5ad522718 100644
--- a/front/components/sparkle/AppLayout.tsx
+++ b/front/components/sparkle/AppLayout.tsx
@@ -6,6 +6,8 @@ import { useRouter } from "next/router";
 import Script from "next/script";
 import React, { Fragment, useEffect, useState } from "react";
 
+import { GenerationContextProvider } from "@app/components/assistant/conversation/GenerationContextProvider";
+import { HelpAndQuickGuideWrapper } from "@app/components/assistant/conversation/HelpAndQuickGuideWrapper";
 import { CONVERSATION_PARENT_SCROLL_DIV_ID } from "@app/components/assistant/conversation/lib";
 import type { SidebarNavigation } from "@app/components/navigation/config";
 import { Navigation } from "@app/components/navigation/Navigation";
@@ -197,6 +199,11 @@ export default function AppLayout({
           </main>
         </div>
       </div>
+      {user.user && (
+        <GenerationContextProvider>
+          <HelpAndQuickGuideWrapper owner={owner} user={user.user} />
+        </GenerationContextProvider>
+      )}
       <>
         <Script
           src={`https://www.googletagmanager.com/gtag/js?id=${gaTrackingId}`}