diff --git a/.changeset/chilly-impalas-share.md b/.changeset/chilly-impalas-share.md
new file mode 100644
index 0000000000..1e224240f7
--- /dev/null
+++ b/.changeset/chilly-impalas-share.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+Fix(admin-ui): focus-border clipping
diff --git a/packages/admin-ui/ui/src/domain/inventory/locations/components/address-form/index.tsx b/packages/admin-ui/ui/src/domain/inventory/locations/components/address-form/index.tsx
index d03ddea6e9..7948fd2567 100644
--- a/packages/admin-ui/ui/src/domain/inventory/locations/components/address-form/index.tsx
+++ b/packages/admin-ui/ui/src/domain/inventory/locations/components/address-form/index.tsx
@@ -59,8 +59,8 @@ const AddressForm = ({
   return (
     <>
       <span className="inter-base-semibold">Address</span>
-      <div className="grid grid-cols-1 gap-y-large gap-x-large">
-        <div className="grid grid-cols-2 gap-x-large">
+      <div className="gap-y-large gap-x-large grid grid-cols-1">
+        <div className="gap-x-large grid grid-cols-2">
           <InputField
             label="Company"
             placeholder="Medusa"
@@ -70,7 +70,7 @@ const AddressForm = ({
             })}
           />
         </div>
-        <div className="grid grid-cols-2 gap-x-large">
+        <div className="gap-x-large grid grid-cols-2">
           <InputField
             label="Address 1"
             placeholder="Address 1"
@@ -90,7 +90,7 @@ const AddressForm = ({
             })}
           />
         </div>
-        <div className="grid grid-cols-2 gap-x-large">
+        <div className="gap-x-large grid grid-cols-2">
           <InputField
             label="Postal code"
             placeholder="Postal code"
@@ -108,7 +108,7 @@ const AddressForm = ({
             })}
           />
         </div>
-        <div className="grid grid-cols-2 gap-x-large">
+        <div className="gap-x-large grid grid-cols-2 pb-0.5">
           <Controller
             control={control}
             name={path("country_code")}