diff --git a/src/components/dialogs/new-package-save-prompt-dialog.tsx b/src/components/dialogs/new-package-save-prompt-dialog.tsx
index caa6020ea..c19c2e171 100644
--- a/src/components/dialogs/new-package-save-prompt-dialog.tsx
+++ b/src/components/dialogs/new-package-save-prompt-dialog.tsx
@@ -116,9 +116,20 @@ export const NewPackageSavePromptDialog = ({
       setIsSaving(false)
     }
   }, [open])
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === "Enter" && !isFormInvalid) {
+      e.preventDefault()
+      handleSave()
+    }
+  }
+
+  const isFormInvalid =
+    orgsLoading || !session || isSaving || !!orgsError || !normalizedPackageName
+
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
+      <DialogContent onKeyDown={handleKeyDown}>
         <DialogHeader>
           <DialogTitle>Creating new package</DialogTitle>
           <DialogDescription>
@@ -253,16 +264,7 @@ export const NewPackageSavePromptDialog = ({
           >
             Cancel
           </Button>
-          <Button
-            onClick={handleSave}
-            disabled={
-              orgsLoading ||
-              !session ||
-              isSaving ||
-              !!orgsError ||
-              !normalizedPackageName
-            }
-          >
+          <Button onClick={handleSave} disabled={isFormInvalid}>
             {isSaving ? "Saving..." : "Save"}
           </Button>
         </div>
diff --git a/src/pages/organization-settings.tsx b/src/pages/organization-settings.tsx
index 66c17884f..7e948348d 100644
--- a/src/pages/organization-settings.tsx
+++ b/src/pages/organization-settings.tsx
@@ -827,7 +827,7 @@ export default function OrganizationSettingsPage() {
                     <Mail className="h-5 w-5" />
                     Invite member
                   </h3>
-                  <div className="grid grid-cols-1 lg:grid-cols-5 gap-4 items-end">
+                  <div className="grid grid-cols-1 lg:grid-cols-5 gap-4 items-start">
                     <div className="lg:col-span-4">
                       <Input
                         id="invite-email-input"