diff --git a/apps/dashboard/src/components/primitives/form/avatar-picker.tsx b/apps/dashboard/src/components/primitives/form/avatar-picker.tsx
index d313545c90f..b1566c93ff0 100644
--- a/apps/dashboard/src/components/primitives/form/avatar-picker.tsx
+++ b/apps/dashboard/src/components/primitives/form/avatar-picker.tsx
@@ -1,4 +1,3 @@
-import { EditorView } from '@uiw/react-codemirror';
 import { forwardRef, useMemo, useState } from 'react';
 import { RiEdit2Line, RiErrorWarningFill, RiImageEditFill } from 'react-icons/ri';
 
@@ -75,13 +74,13 @@ export const AvatarPicker = forwardRef<HTMLInputElement, AvatarPickerProps>(({ n
               <Separator />
               <div className="space-y-1">
                 <Label>Avatar URL</Label>
-                <InputField className="px-1">
+                <InputField size="fit">
                   <Editor
                     fontFamily="inherit"
                     ref={ref}
                     placeholder="Enter avatar URL"
                     id={name}
-                    extensions={[autocompletion({ override: [completions(variables)] }), EditorView.lineWrapping]}
+                    extensions={[autocompletion({ override: [completions(variables)] })]}
                     value={`${value}`}
                     onChange={(newValue) => onChange?.(newValue)}
                   />
diff --git a/apps/dashboard/src/components/primitives/popover.tsx b/apps/dashboard/src/components/primitives/popover.tsx
index 8a5d9d50dbb..5544d06ddef 100644
--- a/apps/dashboard/src/components/primitives/popover.tsx
+++ b/apps/dashboard/src/components/primitives/popover.tsx
@@ -23,7 +23,7 @@ const PopoverContent = React.forwardRef<
       align={align}
       sideOffset={sideOffset}
       className={cn(
-        `bg-background text-foreground-950 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-40 min-w-72 overflow-auto rounded-md border p-4 shadow-md outline-none ${arrowClipPathClassName}`,
+        `bg-background text-foreground-950 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-72 overflow-auto rounded-md border p-4 shadow-md outline-none ${arrowClipPathClassName}`,
         className
       )}
       {...props}