diff --git a/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretRow.tsx b/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretRow.tsx
index e9e9fa1cc8f..c4113ffb1f8 100644
--- a/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretRow.tsx
+++ b/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretRow.tsx
@@ -122,7 +122,6 @@ const SecretRow = ({ secret, onSelectEdit, onSelectRemove }: SecretRowProps) =>
                   <Edit3 size="14" />
                   <p>Edit</p>
                 </DropdownMenuItem>
-              </TooltipTrigger>
                 <DropdownMenuItem
                   className="space-x-2"
                   disabled={!canManageSecrets}
diff --git a/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretsManagement.tsx b/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretsManagement.tsx
index 7282523ab6e..130a5d8ea3d 100644
--- a/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretsManagement.tsx
+++ b/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretsManagement.tsx
@@ -99,11 +99,6 @@ export const SecretsManagement = () => {
                   Updated at
                 </SelectItem_Shadcn_>
                 <SelectItem_Shadcn_ value="name" className="text-xs">
-                  id="name"
-                  className="max-w-[180px]"
-                  value="name"
-                  label="Sort by name"
-                >
                   Name
                 </SelectItem_Shadcn_>
               </SelectContent_Shadcn_>
@@ -141,10 +136,7 @@ export const SecretsManagement = () => {
               {secrets.map((secret, idx) => {
                 return (
                   <Fragment key={`secret-${idx}`}>
-                    <SecretRow
-                      secret={secret}
-                      onSelectRemove={setSelectedSecretToRemove}
-                    />
+                    <SecretRow secret={secret} onSelectRemove={setSelectedSecretToRemove} />
                     {idx !== secrets.length - 1 && <Separator />}
                   </Fragment>
                 )
diff --git a/apps/studio/components/interfaces/Integrations/Vault/Secrets/__tests__/EditSecretModal.test.tsx b/apps/studio/components/interfaces/Integrations/Vault/Secrets/__tests__/EditSecretModal.test.tsx
index 75f08329e90..ca398a914cc 100644
--- a/apps/studio/components/interfaces/Integrations/Vault/Secrets/__tests__/EditSecretModal.test.tsx
+++ b/apps/studio/components/interfaces/Integrations/Vault/Secrets/__tests__/EditSecretModal.test.tsx
@@ -27,7 +27,24 @@ const secret = {
 }
 
 const Page = ({ onClose }: { onClose: () => void }) => {
+  const [modal, setModal] = useState<string | null>(null)
   const [selectedSecretToEdit, setSelectedSecretToEdit] = useState<VaultSecret>()
+  const renderModal = () => {
+    switch (modal) {
+      case `edit`:
+        return (
+          <EditSecretModal
+            secret={secret}
+            onClose={() => {
+              setModal(null)
+              onClose()
+            }}
+          />
+        )
+      default:
+        return null
+    }
+  }
   return (
     <ProjectContextProvider projectRef="default">
       <DropdownMenu>
@@ -35,24 +52,14 @@ const Page = ({ onClose }: { onClose: () => void }) => {
           <Button title="Manage Secret" type="text" className="px-1" icon={<MoreVertical />} />
         </DropdownMenuTrigger>
         <DropdownMenuContent side="bottom" align="end" className="w-32">
-          <DropdownMenuItem
-            className="space-x-2"
-            disabled={false}
-            onClick={() => setSelectedSecretToEdit(secret)}
-          >
+          <DropdownMenuItem className="space-x-2" onClick={() => setModal(`edit`)}>
             <Edit3 size="14" />
             <p>Edit</p>
           </DropdownMenuItem>
         </DropdownMenuContent>
       </DropdownMenu>
 
-      <EditSecretModal
-        secret={selectedSecretToEdit}
-        onClose={() => {
-          setSelectedSecretToEdit(undefined)
-          onClose()
-        }}
-      />
+      {renderModal()}
     </ProjectContextProvider>
   )
 }