diff --git a/novelwriter/core/tokenizer.py b/novelwriter/core/tokenizer.py
index f148236f..ef3136fd 100644
--- a/novelwriter/core/tokenizer.py
+++ b/novelwriter/core/tokenizer.py
@@ -570,24 +570,16 @@ class Tokenizer(ABC):
 
             elif aLine[:3] == "#! ":
                 nHead += 1
-                if self._isNovel:
-                    tStyle = self.T_TITLE
-                else:
-                    tStyle = self.T_HEAD1
-
                 self._tokens.append((
-                    tStyle, nHead, aLine[3:].strip(), [], self.A_PBB | self.A_CENTRE
+                    self.T_TITLE, nHead, aLine[3:].strip(), [], self.A_PBB | self.A_CENTRE
                 ))
                 if self._keepMarkdown:
                     tmpMarkdown.append("%s\n" % aLine)
 
             elif aLine[:4] == "##! ":
                 nHead += 1
-                if self._isNovel:
-                    tStyle = self.T_UNNUM
-                else:
-                    tStyle = self.T_HEAD2
-
+                # If we're not in a novel section, we just treat this as a regular H2
+                tStyle = self.T_UNNUM if self._isNovel else self.T_HEAD2
                 self._tokens.append((
                     tStyle, nHead, aLine[4:].strip(), [], self.A_NONE
                 ))
@@ -641,7 +633,7 @@ class Tokenizer(ABC):
         # If we have content, turn off the first page flag
         if self._isFirst and self._tokens:
             self._isFirst = False  # First document has been processed
-            self._noBreak = True   # Checks again after headers are processed
+            self._noBreak = True   # Check again after headers are processed
 
             # Make sure the token array doesn't start with a page break
             # on the very first page, adding a blank first page.
diff --git a/tests/test_core/test_core_tohtml.py b/tests/test_core/test_core_tohtml.py
index 80ac1b65..3ccfecf3 100644
--- a/tests/test_core/test_core_tohtml.py
+++ b/tests/test_core/test_core_tohtml.py
@@ -131,7 +131,7 @@ def testCoreToHtml_ConvertHeaders(mockGUI):
     html.doHeaders()
     html.doConvert()
     assert html.result == (
-        "<h1 style='text-align: center; page-break-before: always;'>"
+        "<h1 class='title' style='text-align: center; page-break-before: always;'>"
         "<a name='T0001'></a>Heading One</h1>\n"
     )
 
diff --git a/tests/test_core/test_core_tokenizer.py b/tests/test_core/test_core_tokenizer.py
index ea744eae..2538d760 100644
--- a/tests/test_core/test_core_tokenizer.py
+++ b/tests/test_core/test_core_tokenizer.py
@@ -261,7 +261,7 @@ def testCoreToken_HeaderFormat(mockGUI):
 
     tokens.tokenizeText()
     assert tokens._tokens == [
-        (Tokenizer.T_HEAD1, 1, "Note Title", [], Tokenizer.A_CENTRE),
+        (Tokenizer.T_TITLE, 1, "Note Title", [], Tokenizer.A_CENTRE),
         (Tokenizer.T_EMPTY, 1, "", [], Tokenizer.A_NONE),
     ]
     assert tokens.allMarkdown[-1] == "#! Note Title\n\n"
@@ -411,7 +411,7 @@ def testCoreToken_HeaderFormat(mockGUI):
     tokens.tokenizeText()
     tokens.doHeaders()
     assert tokens._tokens == [
-        (Tokenizer.T_HEAD1, 1, "Title", [], Tokenizer.A_PBB | Tokenizer.A_CENTRE),
+        (Tokenizer.T_TITLE, 1, "Title", [], Tokenizer.A_PBB | Tokenizer.A_CENTRE),
         (Tokenizer.T_EMPTY, 1, "", [], Tokenizer.A_NONE),
     ]
     assert tokens.allMarkdown[-1] == "#! Title\n\n"