diff --git a/src/components/CodeEmbed/frame.tsx b/src/components/CodeEmbed/frame.tsx
index 35c14e0393..c7ccbe83ee 100644
--- a/src/components/CodeEmbed/frame.tsx
+++ b/src/components/CodeEmbed/frame.tsx
@@ -7,6 +7,7 @@ interface CodeBundle {
   js?: string;
   base?: string;
   scripts?: string[];
+  parentOrigin?: string;
 }
 
 /*
@@ -51,6 +52,8 @@ ${(code.scripts?.length ?? 0) > 0 ? '' : `
 <script type="text/javascript">
   // Listen for p5.min.js text content and include in iframe's head as script
   window.addEventListener("message", event => {
+    if (event.origin !== '${code.parentOrigin}') return;
+    if (event.source !== window.parent) return;
     // Include check to prevent p5.min.js from being loaded twice
     const scriptExists = !!document.getElementById("p5ScriptTagInIframe");
     if (!scriptExists && event.data?.sender === '${cdnLibraryUrl}') {
@@ -139,7 +142,7 @@ export const CodeFrame = (props: CodeFrameProps) => {
             sender: cdnLibraryUrl,
             message: p5ScriptText,
           },
-          "*",
+          window.location.origin,
         );
       } catch (e) {
         console.error(`Error loading ${p5ScriptTag.src}`);
@@ -161,6 +164,7 @@ export const CodeFrame = (props: CodeFrameProps) => {
           htmlBody: props.htmlBodyCode,
           base: props.base,
           scripts: props.scripts,
+          parentOrigin: window.location.origin,
         }) : ""}
         sandbox="allow-scripts allow-popups allow-modals allow-forms allow-same-origin"
         aria-label="Code Preview"
diff --git a/src/components/SearchProvider/index.tsx b/src/components/SearchProvider/index.tsx
index 05b9d28835..1d6cc554f3 100644
--- a/src/components/SearchProvider/index.tsx
+++ b/src/components/SearchProvider/index.tsx
@@ -1,5 +1,5 @@
-import { useEffect, useState } from "preact/hooks";
-import Fuse, { type FuseResult } from "fuse.js";
+import { useEffect, useRef, useState } from "preact/hooks";
+import Fuse from "fuse.js";
 import SearchResults from "../SearchResults";
 import { defaultLocale } from "@/src/i18n/const";
 
@@ -16,6 +16,9 @@ type SearchResult = {
   description?: string;
 };
 
+type SearchIndexEntry = Omit<SearchResult, "id" | "category" | "title">;
+type SearchIndexData = Record<string, Record<string, SearchIndexEntry>>;
+
 /**
  * SearchProvider this component is responsible for handling client-side search.
  * It reads the search term from query params and fetches the search index for the current locale.
@@ -28,6 +31,8 @@ const SearchProvider = ({
 }: SearchProviderProps) => {
   const [searchTerm, setSearchTerm] = useState("");
   const [results, setResults] = useState<SearchResult[]>([]);
+  const [searchIndexVersion, setSearchIndexVersion] = useState(0);
+  const fuseRef = useRef<Fuse<SearchResult> | null>(null);
 
   // Flattens the search index data
   
@@ -48,16 +53,14 @@ const SearchProvider = ({
     }
   }, [searchTerm]);
 
-  // Fetch the search index for the current locale and search for the search term
-  // This effect runs whenever the search term or the current locale changes
+  // Fetch the search index for the current locale
   useEffect(() => {
     if (!currentLocale) {
       console.warn("No locale provided to SearchProvider");
       return;
     }
 
-    if (!searchTerm) return;
-    const flattenData = (data: FuseResult<SearchResult>) => {
+    const flattenData = (data: SearchIndexData) => {
       const flatData: SearchResult[] = [];
       let flatId = 0;
       Object.entries(data).forEach(([category, entries]) => {
@@ -82,12 +85,11 @@ const SearchProvider = ({
       return flatData;
     };
 
-    let flatData;
-
-    fetch(`/search-indices/${currentLocale}.json`)
+    const controller = new AbortController();
+    fetch(`/search-indices/${currentLocale}.json`, { signal: controller.signal })
       .then((response) => response.json())
       .then((data) => {
-        flatData = flattenData(data);
+        const flatData = flattenData(data);
 
         const fuseOptions = {
           includeScore: true,
@@ -100,18 +102,37 @@ const SearchProvider = ({
           threshold: 0.3,
         };
 
-        const fuse = new Fuse(flatData, fuseOptions);
+        fuseRef.current = new Fuse(flatData, fuseOptions);
+        setSearchIndexVersion((version) => version + 1);
+      })
+      .catch((error) => {
+        if (error.name !== "AbortError") {
+          console.error("Error fetching or indexing data:", error);
+        }
+      });
 
-        const searchResults = fuse
-          .search(searchTerm)
-          .map((result) => result.item);
+    return () => controller.abort();
+  }, [currentLocale]);
 
-        setResults(searchResults);
-      })
-      .catch((error) =>
-        console.error("Error fetching or indexing data:", error),
-      );
-  }, [searchTerm, currentLocale]);
+  // Search after search term updates
+  useEffect(() => {
+    if (!searchTerm) {
+      setResults([]);
+      return;
+    }
+
+    if (!fuseRef.current) return;
+
+    const timeoutId = window.setTimeout(() => {
+      const searchResults = fuseRef.current
+        ?.search(searchTerm)
+        .map((result) => result.item);
+
+      setResults(searchResults || []);
+    }, 250);
+
+    return () => window.clearTimeout(timeoutId);
+  }, [searchTerm, searchIndexVersion]);
 
   const handleSearchTermChange = (term?: string) => {
     if (term !== undefined) {