diff --git a/novelwriter/core/docbuild.py b/novelwriter/core/docbuild.py
index fec7aa97..534cdd6c 100644
--- a/novelwriter/core/docbuild.py
+++ b/novelwriter/core/docbuild.py
@@ -170,6 +170,7 @@ class NWBuildDocument:
         makeObj = ToHtml(self._project)
         filtered = self._setupBuild(makeObj)
 
+        makeObj.setPreview(self._preview)
         for i, tHandle in enumerate(self._queue):
             self._error = None
             if filtered.get(tHandle, (False, 0))[0]:
diff --git a/novelwriter/core/tohtml.py b/novelwriter/core/tohtml.py
index 58b7d806..da2507bd 100644
--- a/novelwriter/core/tohtml.py
+++ b/novelwriter/core/tohtml.py
@@ -74,15 +74,9 @@ class ToHtml(Tokenizer):
     #  Setters
     ##
 
-    def setPreview(self, doComments: bool, doSynopsis: bool) -> None:
-        """If we're using this class to generate markdown preview, we
-        need to make a few changes to formatting, which is managed by
-        these flags.
-        """
-        self._genMode = self.M_PREVIEW
-        self._doKeywords = True
-        self._doComments = doComments
-        self._doSynopsis = doSynopsis
+    def setPreview(self, state: bool) -> None:
+        """Set to preview generator mode."""
+        self._genMode = self.M_PREVIEW if state else self.M_EXPORT
         return
 
     def setStyles(self, cssStyles: bool) -> None:
@@ -302,8 +296,7 @@ class ToHtml(Tokenizer):
                 lines.append(tTemp)
 
         self._result = "".join(lines)
-        if self._genMode != self.M_PREVIEW:
-            self._fullHTML.append(self._result)
+        self._fullHTML.append(self._result)
 
         return
 
diff --git a/novelwriter/gui/docviewer.py b/novelwriter/gui/docviewer.py
index 891af3e6..701edafd 100644
--- a/novelwriter/gui/docviewer.py
+++ b/novelwriter/gui/docviewer.py
@@ -197,7 +197,10 @@ class GuiDocViewer(QTextBrowser):
 
         sPos = self.verticalScrollBar().value()
         aDoc = ToHtml(SHARED.project)
-        aDoc.setPreview(CONFIG.viewComments, CONFIG.viewSynopsis)
+        aDoc.setPreview(True)
+        aDoc.setKeywords(True)
+        aDoc.setComments(CONFIG.viewComments)
+        aDoc.setSynopsis(CONFIG.viewSynopsis)
         aDoc.setLinkHeadings(True)
 
         # Be extra careful here to prevent crashes when first opening a
diff --git a/tests/test_core/test_core_tohtml.py b/tests/test_core/test_core_tohtml.py
index beb837e0..9f656ca4 100644
--- a/tests/test_core/test_core_tohtml.py
+++ b/tests/test_core/test_core_tohtml.py
@@ -247,7 +247,7 @@ def testCoreToHtml_ConvertParagraphs(mockGUI):
     # Preview Mode
     # ============
 
-    html.setPreview(True, True)
+    html.setPreview(True)
 
     # Text (HTML4)
     html._text = "Some **nested bold and _italic_ and ~~strikethrough~~ text** here\n"
@@ -606,16 +606,6 @@ def testCoreToHtml_Methods(mockGUI):
         "<p>Text with &lt;brackets&gt; &amp; short&ndash;dash, long&mdash;dash &hellip;</p>\n"
     )
 
-    # With Preview
-    html.setPreview(True, True)
-    html._text = docText
-    html.doPreProcessing()
-    html.tokenizeText()
-    html.doConvert()
-    assert html.allMarkdown[-1] == (
-        "Text with <brackets> &amp; short&ndash;dash, long&mdash;dash &hellip;\n\n"
-    )
-
     # Result Size
     assert html.getFullResultSize() == 147
 
@@ -669,7 +659,7 @@ def testCoreToHtml_Format(mockGUI):
     # Preview Mode
     # ============
 
-    html.setPreview(True, True)
+    html.setPreview(True)
 
     assert html._formatSynopsis("synopsis text", True) == (
         "<p class='comment'><span class='synopsis'>Synopsis:</span> synopsis text</p>\n"