diff --git a/src/components/AIGuide/AIGuideActions.tsx b/src/components/AIGuide/AIGuideActions.tsx
index faa23e2b7..65772b877 100644
--- a/src/components/AIGuide/AIGuideActions.tsx
+++ b/src/components/AIGuide/AIGuideActions.tsx
@@ -63,7 +63,7 @@ export function AIGuideActions(props: AIGuideActionsType) {
       {isOpen && (
         <div className="absolute top-8 right-0 z-10 w-48 overflow-hidden rounded-md border border-gray-200 bg-white shadow-lg">
           <a
-            href={`/ai/guides/${guideSlug}`}
+            href={`/ai/guide/${guideSlug}`}
             className="flex w-full items-center gap-1.5 p-2 text-sm font-medium text-gray-500 hover:bg-gray-100 hover:text-black disabled:cursor-not-allowed disabled:opacity-70"
           >
             <ArrowUpRightIcon className="h-3.5 w-3.5" />
diff --git a/src/components/AIGuide/AIGuideCard.tsx b/src/components/AIGuide/AIGuideCard.tsx
index 8b5b8ae32..f49e81978 100644
--- a/src/components/AIGuide/AIGuideCard.tsx
+++ b/src/components/AIGuide/AIGuideCard.tsx
@@ -19,7 +19,7 @@ export function AIGuideCard(props: AIGuideCardProps) {
   return (
     <div className="relative flex flex-grow flex-col">
       <a
-        href={`/ai/guides/${guide.slug}`}
+        href={`/ai/guide/${guide.slug}`}
         className="hover:border-gray-3 00 group relative flex h-full min-h-[140px] w-full flex-col overflow-hidden rounded-lg border border-gray-200 bg-white p-4 text-left transition-all hover:bg-gray-50"
       >
         <div className="flex items-center justify-between">
diff --git a/src/components/GenerateGuide/AIGuide.tsx b/src/components/GenerateGuide/AIGuide.tsx
index 2a6f774dc..4d434dacf 100644
--- a/src/components/GenerateGuide/AIGuide.tsx
+++ b/src/components/GenerateGuide/AIGuide.tsx
@@ -107,18 +107,20 @@ export function AIGuide(props: AIGuideProps) {
         )}
         {!guideSlug && <GenerateAIGuide onGuideSlugChange={setGuideSlug} />}
 
-        {!isAiGuideSuggestionsLoading && aiGuide && !isRegenerating && (
+        {aiGuide && !isRegenerating && (
           <div className="mt-4 grid grid-cols-2 divide-x divide-gray-200 rounded-lg border border-gray-200 bg-white">
             <ListSuggestions
               title="Related Topics"
               suggestions={relatedTopics}
               depth="essentials"
+              isLoading={isAiGuideSuggestionsLoading}
             />
 
             <ListSuggestions
               title="Dive Deeper"
               suggestions={deepDiveTopics}
               depth="detailed"
+              isLoading={isAiGuideSuggestionsLoading}
             />
           </div>
         )}
@@ -128,6 +130,7 @@ export function AIGuide(props: AIGuideProps) {
         isGuideLoading={!aiGuide}
         onUpgrade={() => setShowUpgradeModal(true)}
         randomQuestions={randomQuestions}
+        isQuestionsLoading={isAiGuideSuggestionsLoading}
       />
     </AITutorLayout>
   );
@@ -137,10 +140,11 @@ type ListSuggestionsProps = {
   title: string;
   suggestions: string[];
   depth: string;
+  isLoading: boolean;
 };
 
 export function ListSuggestions(props: ListSuggestionsProps) {
-  const { title, suggestions, depth } = props;
+  const { title, suggestions, depth, isLoading } = props;
 
   return (
     <div className="flex flex-col">
@@ -148,21 +152,31 @@ export function ListSuggestions(props: ListSuggestionsProps) {
         {title}
       </h2>
       <ul className="flex flex-col gap-1 p-1">
-        {suggestions?.map((topic) => {
-          const url = `/ai/guides?term=${encodeURIComponent(topic)}&depth=${depth}&id=&format=guide`;
+        {isLoading && (
+          <>
+            {[1, 2].map((i) => (
+              <div key={i} className="w-full">
+                <div className="h-7 w-full animate-pulse rounded-md bg-gray-200"></div>
+              </div>
+            ))}
+          </>
+        )}
+        {!isLoading &&
+          suggestions?.map((topic) => {
+            const url = `/ai/guides?term=${encodeURIComponent(topic)}&depth=${depth}&id=&format=guide`;
 
-          return (
-            <li key={topic} className="w-full">
-              <a
-                href={url}
-                target="_blank"
-                className="block truncate rounded-md px-2 py-1 text-sm hover:bg-gray-100"
-              >
-                {topic}
-              </a>
-            </li>
-          );
-        })}
+            return (
+              <li key={topic} className="w-full">
+                <a
+                  href={url}
+                  target="_blank"
+                  className="block truncate rounded-md px-2 py-1 text-sm hover:bg-gray-100"
+                >
+                  {topic}
+                </a>
+              </li>
+            );
+          })}
       </ul>
     </div>
   );
diff --git a/src/components/GenerateGuide/AIGuideChat.tsx b/src/components/GenerateGuide/AIGuideChat.tsx
index 8aba43376..0207d0e4a 100644
--- a/src/components/GenerateGuide/AIGuideChat.tsx
+++ b/src/components/GenerateGuide/AIGuideChat.tsx
@@ -24,11 +24,18 @@ type AIGuideChatProps = {
   guideSlug?: string;
   isGuideLoading?: boolean;
   onUpgrade?: () => void;
+  isQuestionsLoading?: boolean;
   randomQuestions?: string[];
 };
 
 export function AIGuideChat(props: AIGuideChatProps) {
-  const { guideSlug, isGuideLoading, onUpgrade, randomQuestions } = props;
+  const {
+    guideSlug,
+    isGuideLoading,
+    onUpgrade,
+    randomQuestions,
+    isQuestionsLoading,
+  } = props;
 
   const scrollareaRef = useRef<HTMLDivElement>(null);
   const inputRef = useRef<HTMLInputElement>(null);
@@ -163,7 +170,18 @@ export function AIGuideChat(props: AIGuideChatProps) {
                     html="Hello, how can I help you today?"
                     isIntro
                   />
-                  {randomQuestions &&
+                  {isQuestionsLoading && (
+                    <div className="flex flex-col gap-1">
+                      {[1, 2, 3, 4].map((i) => (
+                        <div
+                          key={i}
+                          className="h-[38px] w-full animate-pulse rounded-lg bg-gray-200"
+                        ></div>
+                      ))}
+                    </div>
+                  )}
+                  {!isQuestionsLoading &&
+                    randomQuestions &&
                     randomQuestions.length > 0 &&
                     messages.length === 0 && (
                       <>
diff --git a/src/components/GenerateGuide/GenerateAIGuide.tsx b/src/components/GenerateGuide/GenerateAIGuide.tsx
index e8adab97e..8d511a33f 100644
--- a/src/components/GenerateGuide/GenerateAIGuide.tsx
+++ b/src/components/GenerateGuide/GenerateAIGuide.tsx
@@ -108,7 +108,7 @@ export function GenerateAIGuide(props: GenerateAIGuideProps) {
         );
 
         onGuideSlugChange?.(guideSlug);
-        window.history.replaceState(null, '', `/ai/guides/${guideSlug}`);
+        window.history.replaceState(null, '', `/ai/guide/${guideSlug}`);
       },
       onLoadingChange: setIsLoading,
       onError: setError,
diff --git a/src/pages/ai/guides/[slug].astro b/src/pages/ai/guide/[slug].astro
similarity index 92%
rename from src/pages/ai/guides/[slug].astro
rename to src/pages/ai/guide/[slug].astro
index 669ff36c5..9190b55b2 100644
--- a/src/pages/ai/guides/[slug].astro
+++ b/src/pages/ai/guide/[slug].astro
@@ -16,7 +16,7 @@ const { slug } = Astro.params as Params;
   briefTitle='AI Tutor'
   description='AI Tutor'
   keywords={['ai', 'tutor', 'education', 'learning']}
-  canonicalUrl={`/ai/document/${slug}`}
+  canonicalUrl={`/ai/guide/${slug}`}
 >
   <AIGuide client:load guideSlug={slug} />
 </SkeletonLayout>
diff --git a/src/pages/ai/guides/index.astro b/src/pages/ai/guide/index.astro
similarity index 95%
rename from src/pages/ai/guides/index.astro
rename to src/pages/ai/guide/index.astro
index 405ac8d4d..efb74dc60 100644
--- a/src/pages/ai/guides/index.astro
+++ b/src/pages/ai/guide/index.astro
@@ -11,7 +11,7 @@ import SkeletonLayout from '../../../layouts/SkeletonLayout.astro';
   briefTitle='AI Tutor'
   description='AI Tutor'
   keywords={['ai', 'tutor', 'education', 'learning']}
-  canonicalUrl='/ai/document'
+  canonicalUrl='/ai/guide'
   noIndex={true}
 >
   <AIGuide client:load />