diff --git a/src/app/machines/views/MachineList/MachineListTable/MachineListTable.tsx b/src/app/machines/views/MachineList/MachineListTable/MachineListTable.tsx
index 8d5204c925..d581db3051 100644
--- a/src/app/machines/views/MachineList/MachineListTable/MachineListTable.tsx
+++ b/src/app/machines/views/MachineList/MachineListTable/MachineListTable.tsx
@@ -340,8 +340,8 @@ export const MachineListTable = ({
         <TableHeader
           currentSort={currentSort}
           data-testid="disks-header"
-          // TODO: enable sorting by "physical_disk_count" when the API supports it:
-          // https://github.com/canonical/app-tribe/issues/1268
+          onClick={() => updateSort(FetchGroupKey.PhysicalDiskCount)}
+          sortKey={FetchGroupKey.PhysicalDiskCount}
         >
           {columnLabels[MachineColumns.DISKS]}
         </TableHeader>
@@ -355,8 +355,8 @@ export const MachineListTable = ({
         <TableHeader
           currentSort={currentSort}
           data-testid="storage-header"
-          // TODO: enable sorting by "storage" when the API supports it:
-          // https://github.com/canonical/app-tribe/issues/1268
+          onClick={() => updateSort(FetchGroupKey.TotalStorage)}
+          sortKey={FetchGroupKey.TotalStorage}
         >
           {columnLabels[MachineColumns.STORAGE]}
         </TableHeader>
diff --git a/src/app/store/machine/types/actions.ts b/src/app/store/machine/types/actions.ts
index 8c3368a418..46a2fe5771 100644
--- a/src/app/store/machine/types/actions.ts
+++ b/src/app/store/machine/types/actions.ts
@@ -403,6 +403,7 @@ export enum FetchGroupKey {
   Ownerdata = "ownerdata",
   Parent = "parent",
   ParentId = "parent_id",
+  PhysicalDiskCount = "physical_disk_count",
   Podhints = "podhints",
   Pod = "pod",
   PodType = "pod_type",
@@ -430,6 +431,7 @@ export enum FetchGroupKey {
   SyncInterval = "sync_interval",
   SystemId = "system_id",
   Tags = "tags",
+  TotalStorage = "total_storage",
   Updated = "updated",
   Url = "url",
   Virtualmachine = "virtualmachine",