diff --git a/docs/.vuepress/components/TocWithFeedback.ts b/docs/.vuepress/components/TocWithFeedback.ts
index b3fac76ff..72419830f 100644
--- a/docs/.vuepress/components/TocWithFeedback.ts
+++ b/docs/.vuepress/components/TocWithFeedback.ts
@@ -413,66 +413,62 @@ export default defineComponent({
       const before = slots.before?.();
       const after = slots.after?.();
 
-      const tocContent =
-        tocHeaders || before || after
-          ? h("div", { class: "vp-toc-placeholder" }, [
-              h("aside", { id: "toc", "vp-toc": "" }, [
-                // Optional "before" slot
-                before,
-                // The TOC itself
-                tocHeaders
-                  ? [
-                      h(
-                        "div",
-                        { class: "vp-toc-header", onClick: toggleExpanded },
-                        [
-                          metaLocale.value.toc,
-                          h(PrintButton),
-                          h("div", {
-                            class: ["arrow", isExpanded.value ? "down" : "end"],
-                          }),
-                        ]
-                      ),
-                      h(
-                        "div",
-                        {
-                          class: [
-                            "vp-toc-wrapper",
-                            isExpanded.value ? "open" : "",
-                          ],
-                          ref: toc,
+      return h(ClientOnly, () => {
+        if (!tocHeaders && !before && !after) return null;
+
+        // Main TOC container
+        const tocContent = h("div", { class: "vp-toc-placeholder" }, [
+          h("aside", { id: "toc", "vp-toc": "" }, [
+            before,
+            tocHeaders
+              ? [
+                  h(
+                    "div",
+                    {
+                      class: "vp-toc-header",
+                      onClick: () => toggleExpanded(),
+                    },
+                    [
+                      metaLocale.value.toc,
+                      h(PrintButton),
+                      h("div", {
+                        class: ["arrow", isExpanded.value ? "down" : "end"],
+                      }),
+                    ]
+                  ),
+                  h(
+                    "div",
+                    {
+                      class: ["vp-toc-wrapper", isExpanded.value ? "open" : ""],
+                      ref: toc,
+                    },
+                    [
+                      tocHeaders,
+                      h("div", {
+                        class: "vp-toc-marker",
+                        style: {
+                          top: tocMarkerTop.value,
                         },
-                        [
-                          tocHeaders,
-                          h("div", {
-                            class: "vp-toc-marker",
-                            style: { top: tocMarkerTop.value },
-                          }),
-                        ]
-                      ),
+                      }),
                     ]
-                  : null,
-                // Optional "after" slot
-                after,
-                // On desktop: render survey form inside the TOC container
-                !isMobile.value
-                  ? h("div", { class: "toc-survey-section" }, [
-                      renderSurveyForm(),
-                    ])
-                  : null,
-              ]),
-            ])
+                  ),
+                ]
+              : null,
+            after,
+            // Add survey form inside the TOC for desktop
+            !isMobile.value
+              ? h("div", { class: "toc-survey-section" }, [renderSurveyForm()])
+              : null,
+          ]),
+        ]);
+
+        // For mobile: create a separate teleported component
+        const mobileSurvey = isMobile.value
+          ? h(Teleport, { to: ".markdown-content" }, [renderSurveyForm()])
           : null;
 
-      return h(ClientOnly, () =>
-        h("div", {}, [
-          tocContent,
-          // On mobile: teleport the survey form to the element with class "theme-hope-content"
-          isMobile.value
-            ? h(Teleport, { to: ".theme-hope-content" }, [renderSurveyForm()])
-            : null,
-        ])
-      );
+        return mobileSurvey ? [tocContent, mobileSurvey] : tocContent;
+      });
     };
   },
-});
+}); 
\ No newline at end of file
diff --git a/docs/.vuepress/styles/toc.scss b/docs/.vuepress/styles/toc.scss
index 6e12d63d9..e683349e4 100644
--- a/docs/.vuepress/styles/toc.scss
+++ b/docs/.vuepress/styles/toc.scss
@@ -278,14 +278,12 @@ $headings: (2, 3, 4, 5, 6);
 /* The free-text textarea */
 .survey-textarea {
   width: 100%;
-  margin: 0.5rem 0;
   resize: vertical; /* optional, to allow resizing */
 }
 
 /* The optional email field */
 .survey-email {
   width: 100%;
-  margin-bottom: 0.5rem;
 }
 
 /* The "Submit" button */
@@ -307,3 +305,10 @@ $headings: (2, 3, 4, 5, 6);
 .survey-question {
   font-weight: 600;
 }
+
+.toc-survey-section {
+  margin-top: 1rem;
+  position: relative;
+  z-index: 1;
+}
+