diff --git a/src/components/MainTable/MainTable.test.tsx b/src/components/MainTable/MainTable.test.tsx
index ff3a70292..f98b55993 100644
--- a/src/components/MainTable/MainTable.test.tsx
+++ b/src/components/MainTable/MainTable.test.tsx
@@ -197,7 +197,9 @@ describe("MainTable", () => {
       );
 
       await userEvent.click(
-        screen.getByRole("columnheader", { name: "Status" }),
+        within(screen.getByRole("columnheader", { name: "Status" })).getByRole(
+          "button",
+        ),
       );
       // The status should now be ascending.
       expect(within(rowItems[1]).getByRole("rowheader").textContent).toBe(
@@ -213,7 +215,9 @@ describe("MainTable", () => {
       );
 
       await userEvent.click(
-        screen.getByRole("columnheader", { name: "Status" }),
+        within(screen.getByRole("columnheader", { name: "Status" })).getByRole(
+          "button",
+        ),
       );
       // The status should now be descending.
       expect(within(rowItems[1]).getByRole("rowheader").textContent).toBe(
@@ -229,7 +233,9 @@ describe("MainTable", () => {
       );
 
       await userEvent.click(
-        screen.getByRole("columnheader", { name: "Status" }),
+        within(screen.getByRole("columnheader", { name: "Status" })).getByRole(
+          "button",
+        ),
       );
       // The status be back to the original order.
       expect(within(rowItems[1]).getByRole("rowheader").textContent).toBe(
@@ -249,7 +255,9 @@ describe("MainTable", () => {
       render(<MainTable headers={headers} rows={rows} sortable={true} />);
       const rowItems = screen.getAllByRole("row");
       await userEvent.click(
-        screen.getByRole("columnheader", { name: "Status" }),
+        within(screen.getByRole("columnheader", { name: "Status" })).getByRole(
+          "button",
+        ),
       );
 
       const expectedOrder = ["Idle", "Ready", "Waiting"];
@@ -260,6 +268,14 @@ describe("MainTable", () => {
         );
       }
 
+      // Non-sortable columns don't have sort buttons.
+      expect(
+        within(screen.getByRole("columnheader", { name: "RAM" })).queryByRole(
+          "button",
+        ),
+      ).not.toBeInTheDocument();
+
+      // Clicking a column header, not a sort button.
       await userEvent.click(screen.getByRole("columnheader", { name: "RAM" }));
       // The status should not change
       for (let i = 1; i < 4; i++) {
@@ -277,6 +293,46 @@ describe("MainTable", () => {
       }
     });
 
+    it("can be sorted with the keyboard", async () => {
+      render(<MainTable headers={headers} rows={rows} sortable={true} />);
+      const rowItems = screen.getAllByRole("row");
+      // Check the initial status order.
+      expect(within(rowItems[1]).getByRole("rowheader").textContent).toBe(
+        "Ready",
+      );
+
+      expect(within(rowItems[2]).getByRole("rowheader").textContent).toBe(
+        "Waiting",
+      );
+
+      expect(within(rowItems[3]).getByRole("rowheader").textContent).toBe(
+        "Idle",
+      );
+
+      await userEvent.tab();
+      expect(
+        within(screen.getByRole("columnheader", { name: "Status" })).getByRole(
+          "button",
+        ),
+      ).toHaveFocus();
+      await userEvent.keyboard("{Enter}");
+      // The status should now be ascending.
+      expect(within(rowItems[1]).getByRole("rowheader").textContent).toBe(
+        "Idle",
+      );
+      // You should also be able to sort with the Spacebar.
+      await userEvent.keyboard(" ");
+      // The status should now be descending.
+      expect(within(rowItems[1]).getByRole("rowheader").textContent).toBe(
+        "Waiting",
+      );
+      await userEvent.keyboard("{Enter}");
+      // The status be back to the original order.
+      expect(within(rowItems[1]).getByRole("rowheader").textContent).toBe(
+        "Ready",
+      );
+    });
+
     it("can set a default sort", () => {
       render(
         <MainTable
diff --git a/src/components/MainTable/MainTable.tsx b/src/components/MainTable/MainTable.tsx
index 37c367e11..a4f417f66 100644
--- a/src/components/MainTable/MainTable.tsx
+++ b/src/components/MainTable/MainTable.tsx
@@ -167,7 +167,7 @@ const generateHeaders = (
       <TableHeader
         key={index}
         sort={sortDirection}
-        onClick={
+        onSort={
           sortable && sortKey
             ? updateSort.bind(
                 this,
diff --git a/src/components/TableHeader/TableHeader.tsx b/src/components/TableHeader/TableHeader.tsx
index cf7ec5f19..0bc26ca1e 100644
--- a/src/components/TableHeader/TableHeader.tsx
+++ b/src/components/TableHeader/TableHeader.tsx
@@ -12,6 +12,8 @@ export type Props = PropsWithSpread<
      * The direction of sorting, if applicable.
      */
     sort?: SortDirection;
+    /** Function to call when the sort button is clicked. */
+    onSort?: () => void;
   },
   HTMLProps<HTMLTableHeaderCellElement>
 >;
@@ -19,11 +21,21 @@ export type Props = PropsWithSpread<
 const TableHeader = ({
   children,
   sort,
+  onSort,
   ...props
 }: Props): React.JSX.Element => {
+  const headerContents = () =>
+    sort && onSort ? (
+      <button className="p-table__sort-button" onClick={onSort}>
+        {children}
+      </button>
+    ) : (
+      children
+    );
+
   return (
     <th role="columnheader" aria-sort={sort} {...props}>
-      {children}
+      {headerContents()}
     </th>
   );
 };