diff --git a/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.tsx b/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.tsx
index c73162e6d96..b91abe62c28 100644
--- a/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/EdgeFunctionRenderer.tsx
@@ -1,5 +1,6 @@
-import { PropsWithChildren, useMemo, useState } from 'react'
+import { type PropsWithChildren, useMemo, useState } from 'react'
 import { toast } from 'sonner'
+// End of third-party imports
 
 import { useParams } from 'common'
 import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'
@@ -100,7 +101,10 @@ export const EdgeFunctionRenderer = ({
     sendEvent({
       action: 'edge_function_deploy_button_clicked',
       properties: { origin: 'functions_ai_assistant' },
-      groups: { project: ref ?? 'Unknown', organization: org?.slug ?? 'Unknown' },
+      groups: {
+        project: ref ?? 'Unknown',
+        organization: org?.slug ?? 'Unknown',
+      },
     })
 
     setShowReplaceWarning(false)
@@ -134,6 +138,7 @@ export const EdgeFunctionRenderer = ({
         onCancelReplace={() => setShowReplaceWarning(false)}
         onConfirmReplace={() => void performDeploy()}
         onDeploy={handleDeploy}
+        hideDeployButton={showConfirmFooter}
       />
       {showConfirmFooter && (
         <div className="mx-4">
diff --git a/apps/studio/components/ui/EdgeFunctionBlock/EdgeFunctionBlock.tsx b/apps/studio/components/ui/EdgeFunctionBlock/EdgeFunctionBlock.tsx
index 1a164334b21..36c687d67b1 100644
--- a/apps/studio/components/ui/EdgeFunctionBlock/EdgeFunctionBlock.tsx
+++ b/apps/studio/components/ui/EdgeFunctionBlock/EdgeFunctionBlock.tsx
@@ -1,9 +1,10 @@
 import { Code } from 'lucide-react'
 import Link from 'next/link'
-import { DragEvent, ReactNode } from 'react'
+import type { DragEvent, ReactNode } from 'react'
+// End of third-party imports
 
 import { ReportBlockContainer } from 'components/interfaces/Reports/ReportBlock/ReportBlockContainer'
-import { Button, cn, CodeBlock, CodeBlockLang } from 'ui'
+import { Button, CodeBlock, type CodeBlockLang, cn } from 'ui'
 import { Admonition } from 'ui-patterns'
 
 interface EdgeFunctionBlockProps {