diff --git a/src/routes/options-calculator/+page.svelte b/src/routes/options-calculator/+page.svelte
index efed45b9..92cfdc4c 100644
--- a/src/routes/options-calculator/+page.svelte
+++ b/src/routes/options-calculator/+page.svelte
@@ -832,11 +832,11 @@
                       aria-label="Add new stock..."
                     />
                   </div>
-                  {#if inputValue?.length !== 0 && inputValue !== selectedTicker}
-                    <Combobox.Content
-                      class=" z-10 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-default px-1 py-3 shadow-sm outline-hidden"
-                      sideOffset={8}
-                    >
+                  <Combobox.Content
+                    class=" z-10 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-default px-1 py-3 shadow-sm outline-hidden"
+                    sideOffset={8}
+                  >
+                    {#if inputValue?.length !== 0 && inputValue !== selectedTicker}
                       {#each searchBarData as searchItem}
                         <Combobox.Item
                           class="cursor-pointer border-b border-gray-300 dark:border-gray-500 last:border-none flex h-fit w-auto select-none items-center rounded-button py-1 px-2  text-sm capitalize outline-hidden transition-all duration-75 data-highlighted:bg-gray-200 dark:data-highlighted:bg-primary"
@@ -856,12 +856,22 @@
                           </div>
                         </Combobox.Item>
                       {:else}
-                        <span class="block px-5 py-2 text-sm">
+                        <span
+                          class="block px-5 py-2 text-sm text-muted dark:text-white"
+                        >
                           No results found
                         </span>
                       {/each}
-                    </Combobox.Content>
-                  {/if}
+                    {:else}
+                      <Combobox.Item
+                        class="cursor-pointer border-b border-gray-300 dark:border-gray-600 last:border-none flex h-fit w-auto select-none items-center rounded-button py-1.5 pl-5 pr-1.5 text-sm capitalize outline-hidden"
+                      >
+                        <span class=" text-sm text-muted dark:text-white">
+                          No results found
+                        </span>
+                      </Combobox.Item>
+                    {/if}
+                  </Combobox.Content>
                 </Combobox.Root>
 
                 <button
diff --git a/src/routes/watchlist/+layout.svelte b/src/routes/watchlist/+layout.svelte
index 89bf6190..12212bbb 100644
--- a/src/routes/watchlist/+layout.svelte
+++ b/src/routes/watchlist/+layout.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import ArrowLogo from "lucide-svelte/icons/move-up-right";
   import { page } from "$app/stores";
 
   export let data;
diff --git a/src/routes/watchlist/stocks/+page.svelte b/src/routes/watchlist/stocks/+page.svelte
index ef027aa0..8db818bf 100644
--- a/src/routes/watchlist/stocks/+page.svelte
+++ b/src/routes/watchlist/stocks/+page.svelte
@@ -1299,11 +1299,12 @@
                         aria-label="Add new stock"
                       />
                     </div>
-                    {#if inputValue?.length !== 0}
-                      <Combobox.Content
-                        class="w-auto z-10 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-default px-1 py-1.5 shadow-sm outline-hidden"
-                        sideOffset={8}
-                      >
+
+                    <Combobox.Content
+                      class="w-auto z-10 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-default px-1 py-1.5 shadow-sm outline-hidden"
+                      sideOffset={8}
+                    >
+                      {#if inputValue?.length > 0}
                         {#each searchBarData as item}
                           <Combobox.Item
                             class="cursor-pointer border-b border-gray-300 dark:border-gray-600 last:border-none flex h-fit w-auto select-none items-center rounded-button py-1.5 pl-5 pr-1.5 text-sm capitalize outline-hidden transition-all duration-75 data-highlighted:bg-gray-200 dark:data-highlighted:bg-primary"
@@ -1322,13 +1323,24 @@
                               >
                             </div>
                           </Combobox.Item>
+                          <!--This else is related to for loop-->
                         {:else}
-                          <span class="block px-5 py-2 text-sm">
+                          <span
+                            class="block px-5 py-2 text-sm text-muted dark:text-white"
+                          >
                             No results found
                           </span>
                         {/each}
-                      </Combobox.Content>
-                    {/if}
+                      {:else}
+                        <Combobox.Item
+                          class="cursor-pointer border-b border-gray-300 dark:border-gray-600 last:border-none flex h-fit w-auto select-none items-center rounded-button py-1.5 pl-5 pr-1.5 text-sm capitalize outline-hidden"
+                        >
+                          <span class=" text-sm text-muted dark:text-white">
+                            No results found
+                          </span>
+                        </Combobox.Item>
+                      {/if}
+                    </Combobox.Content>
                   </Combobox.Root>
                 </div>