diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 25538d5ac3..7cf2ef547f 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -261,13 +261,14 @@
           </li>
         {/each}
       {/if}
-      {#if loading}
-        <li class="spectrum-Menu-item loading">
-          <ProgressCircle size="S" />
-        </li>
-      {/if}
     </ul>
 
+    {#if loading}
+      <div class="loading" class:loading--withAutocomplete={autocomplete}>
+        <ProgressCircle size="S" />
+      </div>
+    {/if}
+
     {#if footer}
       <div class="footer">
         {footer}
@@ -381,6 +382,12 @@
   }
 
   .loading {
+    position: fixed;
     justify-content: center;
+    right: var(--spacing-s);
+    top: var(--spacing-s);
+  }
+  .loading--withAutocomplete {
+    top: calc(34px + var(--spacing-m));
   }
 </style>