diff --git a/web/src/assets/styles/patternfly-overrides.scss b/web/src/assets/styles/patternfly-overrides.scss
index 71361c6f53..e657a15770 100644
--- a/web/src/assets/styles/patternfly-overrides.scss
+++ b/web/src/assets/styles/patternfly-overrides.scss
@@ -263,11 +263,6 @@ ul {
   border-block-end: 0;
 }
 
-.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > th {
-  white-space: normal;
-  vertical-align: middle;
-}
-
 .pf-v5-c-radio {
   align-items: center;
 }
diff --git a/web/src/components/core/ExpandableSelector.jsx b/web/src/components/core/ExpandableSelector.jsx
index af98528c71..aaad695abd 100644
--- a/web/src/components/core/ExpandableSelector.jsx
+++ b/web/src/components/core/ExpandableSelector.jsx
@@ -57,7 +57,7 @@ import { Table, Thead, Tr, Th, Tbody, Td, ExpandableRowContent, RowSelectVariant
  * @param {ExpandableSelectorColumn[]} props.columns
  */
 const TableHeader = ({ columns }) => (
-  <Thead>
+  <Thead noWrap>
     <Tr>
       <Th />
       <Th />
diff --git a/web/src/components/core/TreeTable.jsx b/web/src/components/core/TreeTable.jsx
index 2f258a13f9..6072fd18d3 100644
--- a/web/src/components/core/TreeTable.jsx
+++ b/web/src/components/core/TreeTable.jsx
@@ -136,7 +136,7 @@ export default function TreeTable({
       isTreeTable
       data-type="agama/tree-table"
     >
-      <Thead>
+      <Thead noWrap>
         <Tr>
           { columns.map((c, i) => <Th key={i} className={c.classNames}>{c.name}</Th>) }
         </Tr>
diff --git a/web/src/components/storage/PartitionsField.jsx b/web/src/components/storage/PartitionsField.jsx
index d01affb92b..87791694d9 100644
--- a/web/src/components/storage/PartitionsField.jsx
+++ b/web/src/components/storage/PartitionsField.jsx
@@ -496,7 +496,7 @@ const VolumesTable = ({
 
   return (
     <Table aria-label={_("Table with mount points")} variant="compact" borders>
-      <Thead>
+      <Thead noWrap>
         <Tr>
           <Th>{columns.mountPath}</Th>
           <Th>{columns.details}</Th>