diff --git a/wa/utils/misc.py b/wa/utils/misc.py
index bb9ab546..2090c24a 100644
--- a/wa/utils/misc.py
+++ b/wa/utils/misc.py
@@ -110,6 +110,8 @@ def write_table(rows, wfh, align='>', headers=None):  # pylint: disable=R0914
 
     cols = list(zip(*rows))
     col_widths = [max(list(map(len, c))) for c in cols]
+    if headers:
+        col_widths = [max([c, len(h)]) for c, h in zip(col_widths, headers)]
     row_format = ' '.join(['{:%s%s}' % (align[i], w) for i, w in enumerate(col_widths)])
     row_format += '\n'