diff --git a/.changeset/heavy-donuts-dress.md b/.changeset/heavy-donuts-dress.md
new file mode 100644
index 0000000000000..bffe0da50dc42
--- /dev/null
+++ b/.changeset/heavy-donuts-dress.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+fix(admin-ui): Fix location address editing form state
diff --git a/.changeset/wicked-cheetahs-fail.md b/.changeset/wicked-cheetahs-fail.md
new file mode 100644
index 0000000000000..9cb2cd77cc0ed
--- /dev/null
+++ b/.changeset/wicked-cheetahs-fail.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+feat(admin-ui): Encode location id in URL on location table
diff --git a/packages/admin-ui/ui/src/components/templates/inventory-table/use-inventory-filters.ts b/packages/admin-ui/ui/src/components/templates/inventory-table/use-inventory-filters.ts
index b529c5b793134..090634cbe3b18 100644
--- a/packages/admin-ui/ui/src/components/templates/inventory-table/use-inventory-filters.ts
+++ b/packages/admin-ui/ui/src/components/templates/inventory-table/use-inventory-filters.ts
@@ -25,7 +25,7 @@ interface InventoryFilterState {
   additionalFilters: InventoryDefaultFilters | null
 }
 
-const allowedFilters = ["location", "q", "offset", "limit"]
+const allowedFilters = ["q", "offset", "limit", "location_id"]
 
 const DefaultTabs = {}
 
@@ -226,8 +226,8 @@ export const useInventoryFilters = (
         if (value && typeof value === "string") {
           toQuery["q"] = value
         }
-      } else if (key === "offset" || key === "limit") {
-        toQuery[key] = value
+      } else if (key === "offset" || key === "limit" || key === "location") {
+        toQuery[stateFilterMap[key] || key] = value
       } else if (value.open) {
         toQuery[stateFilterMap[key]] = value.filter
       }
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 dd0f370dafbdf..bfa2336456254 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
@@ -78,7 +78,9 @@ const AddressForm = ({
             required={addressFieldsRequired}
             {...register(path("address_1"), {
               pattern: FormValidator.whiteSpaceRule("Address 1"),
-              required: addressFieldsRequired,
+              required: addressFieldsRequired
+                ? "This field is required"
+                : undefined,
             })}
           />
           <InputField
@@ -113,7 +115,9 @@ const AddressForm = ({
             control={control}
             name={path("country_code")}
             rules={{
-              required: addressFieldsRequired,
+              required: addressFieldsRequired
+                ? "This field is required"
+                : undefined,
             }}
             render={({ field: { value, onChange } }) => {
               let fieldValue:
diff --git a/packages/admin-ui/ui/src/domain/inventory/locations/edit/index.tsx b/packages/admin-ui/ui/src/domain/inventory/locations/edit/index.tsx
index 194a67cfe27c2..80a8345b995b9 100644
--- a/packages/admin-ui/ui/src/domain/inventory/locations/edit/index.tsx
+++ b/packages/admin-ui/ui/src/domain/inventory/locations/edit/index.tsx
@@ -37,11 +37,11 @@ const LocationEditModal = ({ onClose, location }: LocationEditModalProps) => {
   })
   const notification = useNotification()
 
-  const { mutate } = useAdminUpdateStockLocation(location.id)
+  const { mutate, isLoading } = useAdminUpdateStockLocation(location.id)
 
   const { handleSubmit, formState } = form
 
-  const { isDirty, isValid } = formState
+  const { isDirty } = formState
 
   const onSubmit = handleSubmit(async (data) => {
     const payload = createPayload(data)
@@ -85,7 +85,7 @@ const LocationEditModal = ({ onClose, location }: LocationEditModalProps) => {
             size="small"
             variant="primary"
             type="button"
-            disabled={!isDirty || !isValid}
+            disabled={!isDirty || isLoading}
             onClick={onSubmit}
           >
             Save and close