diff --git a/src/lib/commandCenter/panels/ai.svelte b/src/lib/commandCenter/panels/ai.svelte
index 6819c35f6..0b5b2b32a 100644
--- a/src/lib/commandCenter/panels/ai.svelte
+++ b/src/lib/commandCenter/panels/ai.svelte
@@ -79,11 +79,31 @@
     $: answer = parseCompletion($completion);
 </script>
 
-<Template fullheight --command-panel-max-height="40rem">
+<Template
+    options={$isLoading || answer
+        ? undefined
+        : examples.map((e) => {
+              return {
+                  label: e,
+                  callback: () => {
+                      $input = e;
+                      complete($input);
+                  },
+                  group: 'Examples'
+              };
+          })}
+    clearOnCallback={false}
+    fullheight
+    --command-panel-max-height="40rem">
     <div slot="search" />
 
-    <div class="content">
-        {#if $isLoading || answer}
+    <div slot="option" let:option class="u-flex u-cross-center u-gap-8">
+        <i class="icon-question-mark-circle" />
+        <span>{option.label}</span>
+    </div>
+
+    {#if $isLoading || answer}
+        <div class="content">
             <div class="u-flex u-gap-8">
                 <div class="logo">
                     <img src={CoolerAppwrite} alt="Appwrite logo" />
@@ -104,25 +124,8 @@
                     {/if}
                 </div>
             </div>
-        {:else}
-            <h2 class="eyebrow-heading-3">Examples</h2>
-            <ul class="examples">
-                {#each examples as example}
-                    <li>
-                        <button
-                            class="u-flex u-cross-center u-gap-8"
-                            on:click={() => {
-                                $input = example;
-                                complete($input);
-                            }}>
-                            <i class="icon-question-mark-circle" />
-                            <span>{example}</span>
-                        </button>
-                    </li>
-                {/each}
-            </ul>
-        {/if}
-    </div>
+        </div>
+    {/if}
 
     <div class="footer" slot="footer">
         <div class="u-flex u-cross-center u-gap-4">
diff --git a/src/lib/commandCenter/panels/template.svelte b/src/lib/commandCenter/panels/template.svelte
index 1b82e170e..a6cd091f1 100644
--- a/src/lib/commandCenter/panels/template.svelte
+++ b/src/lib/commandCenter/panels/template.svelte
@@ -13,12 +13,13 @@
     import { quadOut } from 'svelte/easing';
     import { crossfade } from 'svelte/transition';
 
-    type BaseOption = { callback: () => void; group?: CommandGroup; rank?: number };
+    type BaseOption = { callback: () => void; group?: string; rank?: number };
     type Option = $$Generic<BaseOption>;
     export let options: Option[] | null = null;
     export let search = '';
     export let searchPlaceholder = 'Search...';
     export let fullheight = false;
+    export let clearOnCallback = true;
 
     let selected = 0;
     let contentEl: HTMLElement;
@@ -26,7 +27,7 @@
     function triggerOption(option: Option) {
         const prevPanels = $subPanels.length;
         option.callback();
-        if (prevPanels === $subPanels.length) {
+        if (prevPanels === $subPanels.length && clearOnCallback) {
             clearSubPanels();
         }
     }
@@ -118,7 +119,7 @@
     const getGroupsAndOptions = (options: Option[]) => {
         if (!options) return null;
 
-        const groupedOptions = new Map<CommandGroup, Option[]>();
+        const groupedOptions = new Map<string, Option[]>();
         groupedOptions.set('ungrouped', []);
 
         for (const option of options) {