diff --git a/studio/components/grid/components/menu/ColumnMenu.tsx b/studio/components/grid/components/menu/ColumnMenu.tsx
index 7d2c3553b9f..0d4af517ce5 100644
--- a/studio/components/grid/components/menu/ColumnMenu.tsx
+++ b/studio/components/grid/components/menu/ColumnMenu.tsx
@@ -46,7 +46,7 @@ const ColumnMenu = ({ column, isEncrypted }: ColumnMenuProps) => {
       <>
         {state.editable && onEditColumn !== undefined && (
           <Tooltip.Root delayDuration={0}>
-            <Tooltip.Trigger className={`${isEncrypted ? 'opacity-50' : ''}`}>
+            <Tooltip.Trigger asChild className={`${isEncrypted ? 'opacity-50' : ''}`}>
               <Dropdown.Item
                 onClick={onEditColumn}
                 disabled={isEncrypted}
diff --git a/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx b/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
index e0a9474bb88..7fff0a15a28 100644
--- a/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
+++ b/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
@@ -217,7 +217,7 @@ CREATE INDEX ON "${selectedSchema}"."${selectedEntity}" USING ${selectedIndexTyp
                 </Link>
               </div>
             </SidePanel.Content>
-            <div className="h-[200px]">
+            <div className="h-[200px] !mt-2">
               <div className="relative h-full">
                 <CodeEditor
                   isReadOnly