diff --git a/src/xfel_calibrate/calibrate.py b/src/xfel_calibrate/calibrate.py
index 5d9fd28cf4a572004cdf31d106a5e423009822c4..c4b8b76bf1265df33c69cf7f94f441e3fdfe2411 100755
--- a/src/xfel_calibrate/calibrate.py
+++ b/src/xfel_calibrate/calibrate.py
@@ -513,6 +513,10 @@ def make_par_table(parms):
         line = ''
         for i in range(0, len(seq), length):
             sub_line = seq[i:i + length]
+            # Ensure proper line break if the
+            # start of the new line begins with `_`
+            if sub_line[0] == '_' and line[-1] == "-":
+                line += '\\'
             line += sub_line.replace('/', '/\-')
             if not any(c in lbc for c in sub_line):
                 line += '\-'
@@ -528,11 +532,10 @@ def make_par_table(parms):
             len_parms[0] = max_len[0]
             name = split_len(name, max_len[0])
 
-        value = str(p.value)
+        value = tex_escape(str(p.value))
         if len(value) > max_len[1]:
             len_parms[1] = max_len[1]
             value = split_len(value, max_len[1])
-        value = tex_escape(value)
         if issubclass(p.type, str):
             value = "``{}''".format(value)
         comment = tex_escape(str(p.comment)[1:])