diff --git a/changes/issue-8390-extra-whitespace-after-last-table-header-with-tooltip b/changes/issue-8390-extra-whitespace-after-last-table-header-with-tooltip
new file mode 100644
index 0000000000..a8c9c2b731
--- /dev/null
+++ b/changes/issue-8390-extra-whitespace-after-last-table-header-with-tooltip
@@ -0,0 +1 @@
+- remove extra whitespace in datatable after the last header containing a tooltip
diff --git a/frontend/pages/hosts/ManageHostsPage/_styles.scss b/frontend/pages/hosts/ManageHostsPage/_styles.scss
index d9058f20fc..1d98e4533a 100644
--- a/frontend/pages/hosts/ManageHostsPage/_styles.scss
+++ b/frontend/pages/hosts/ManageHostsPage/_styles.scss
@@ -172,6 +172,16 @@
             overflow-x: scroll;
           }
           &__table {
+            thead {
+              tr {
+                th:last-child {
+                  .component__tooltip-wrapper__tip-text {
+                    left: -8px;
+                  }
+                }
+              }
+            }
+
             tbody {
               .issues__cell {
                 display: flex;
@@ -184,6 +194,7 @@
                   }
                 }
               }
+
               .device_mapping__cell {
                 .text-cell {
                   display: inline;