diff --git a/labscript_utils/qtwidgets/headerview_with_widgets.py b/labscript_utils/qtwidgets/headerview_with_widgets.py
index 89fdaef..c740d51 100644
--- a/labscript_utils/qtwidgets/headerview_with_widgets.py
+++ b/labscript_utils/qtwidgets/headerview_with_widgets.py
@@ -20,7 +20,7 @@ class HorizontalHeaderViewWithWidgets(QtWidgets.QHeaderView):
                  /* Required, otherwise set to zero upon setting any stylesheet at all: */
                  padding-left: 4px;
                  /* Required for some reason, otherwise other settings ignored: */
-                 color: black;
+                 color: palette(text);
                  }
 
                  /* Any other style goes here: */
@@ -122,7 +122,7 @@ def update_indents(self):
                 font = item.font()
                 fontmetrics = QtGui.QFontMetrics(font, self)
                 indent = ''
-                while fontmetrics.width(indent) < desired_indent:
+                while fontmetrics.horizontalAdvance(indent) < desired_indent:
                     indent += self.thinspace
                 self.indents[widget] = indent
         font = self.font()