diff --git a/libs/designer-ui/src/lib/settings/settingsection/settingTokenField.tsx b/libs/designer-ui/src/lib/settings/settingsection/settingTokenField.tsx
index 6de256ead5e..426070e2b9a 100644
--- a/libs/designer-ui/src/lib/settings/settingsection/settingTokenField.tsx
+++ b/libs/designer-ui/src/lib/settings/settingsection/settingTokenField.tsx
@@ -128,10 +128,14 @@ export const TokenField = ({
           onChange={onValueChange}
           dataAutomationId={`msla-setting-token-editor-arrayeditor-${labelForAutomationId}`}
           // Props for dynamic options
-          options={dropdownOptions?.map((option: any, index: number) => ({
-            key: index.toString(),
-            ...option,
-          }))}
+          options={
+            dropdownOptions.length > 0
+              ? dropdownOptions.map((option: any, index: number) => ({
+                  key: index.toString(),
+                  ...option,
+                }))
+              : undefined
+          }
           isLoading={isLoading}
           errorDetails={errorDetails}
           onMenuOpen={onComboboxMenuOpen}
diff --git a/libs/designer-ui/src/lib/tokenpicker/index.tsx b/libs/designer-ui/src/lib/tokenpicker/index.tsx
index 350b8d3bedf..b6614c0658d 100644
--- a/libs/designer-ui/src/lib/tokenpicker/index.tsx
+++ b/libs/designer-ui/src/lib/tokenpicker/index.tsx
@@ -148,14 +148,7 @@ export function TokenPicker({
     description: 'Placeholder text to search token picker',
   });
 
-  const topCalloutStyle = windowDimensions.height / 5.25;
-
   const calloutStyles: Partial<ICalloutContentStyles> = {
-    root: {
-      position: 'fixed',
-      top: `${topCalloutStyle}px !important`,
-      maxHeight: '470px !important',
-    },
     calloutMain: {
       overflow: 'visible',
     },
diff --git a/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickersection.tsx b/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickersection.tsx
index 87527ae12e1..cf1f60a588e 100644
--- a/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickersection.tsx
+++ b/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickersection.tsx
@@ -66,7 +66,7 @@ export const TokenPickerSection = ({
       style={{
         maxHeight: fullScreen
           ? windowDimensions.height - (expressionEditorCurrentHeight + 287)
-          : Math.min(windowDimensions.height - (expressionEditorCurrentHeight + 197), 180),
+          : Math.min(windowDimensions.height - (expressionEditorCurrentHeight + 197), 540),
       }}
     >
       {searchQuery && noItems ? <TokenPickerNoMatches /> : null}