diff --git a/nw/gui/winmain.py b/nw/gui/winmain.py
index 6eabeeb9..90e81481 100644
--- a/nw/gui/winmain.py
+++ b/nw/gui/winmain.py
@@ -431,9 +431,9 @@ class GuiMain(QMainWindow):
     #  Main Window Actions
     ##
 
-    def closeMain(self, isYes=False):
+    def closeMain(self):
 
-        if not isYes:
+        if self.mainConf.showGUI:
             msgBox = QMessageBox()
             msgRes = msgBox.question(
                 self, "Exit",
diff --git a/sample/sampleNovel/nwProject.nwx b/sample/sampleNovel/nwProject.nwx
index 0a81731f..a6fdb23c 100644
--- a/sample/sampleNovel/nwProject.nwx
+++ b/sample/sampleNovel/nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-24 00:28:28">
+<novelWriterXML appVersion="0.1.4" fileVersion="1.0" timeStamp="2019-05-25 23:24:06">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
@@ -9,7 +9,8 @@
   <settings>
     <spellCheck>True</spellCheck>
     <lastEdited>636b6aa9b697b</lastEdited>
-    <lastViewed>636b6aa9b697b</lastViewed>
+    <lastViewed>None</lastViewed>
+    <lastWordCount>523</lastWordCount>
     <status>
       <entry blue="100" green="100" red="100">New</entry>
       <entry blue="0" green="50" red="200">Notes</entry>
@@ -75,7 +76,7 @@
       <charCount>577</charCount>
       <wordCount>104</wordCount>
       <paraCount>5</paraCount>
-      <cursorPos>603</cursorPos>
+      <cursorPos>655</cursorPos>
     </item>
     <item handle="bc0cbd2a407f3" order="2" parent="e7ded148d6e4a">
       <name>New File</name>
diff --git a/tests/reference/gui/0_nwProject.nwx b/tests/reference/gui/0_nwProject.nwx
index a42179e9..e1685c0f 100644
--- a/tests/reference/gui/0_nwProject.nwx
+++ b/tests/reference/gui/0_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-23 23:02:29">
+<novelWriterXML appVersion="0.1.4" fileVersion="1.0" timeStamp="2019-05-25 23:29:02">
   <project>
     <name></name>
     <title></title>
@@ -8,6 +8,7 @@
     <spellCheck>False</spellCheck>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastWordCount>0</lastWordCount>
     <status>
       <entry blue="100" green="100" red="100">New</entry>
       <entry blue="0" green="50" red="200">Note</entry>
diff --git a/tests/reference/gui/1_nwProject.nwx b/tests/reference/gui/1_nwProject.nwx
index 971954a6..ae897362 100644
--- a/tests/reference/gui/1_nwProject.nwx
+++ b/tests/reference/gui/1_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-22 21:14:26">
+<novelWriterXML appVersion="0.1.4" fileVersion="1.0" timeStamp="2019-05-25 23:29:32">
   <project>
     <name></name>
     <title></title>
@@ -8,6 +8,7 @@
     <spellCheck>True</spellCheck>
     <lastEdited>31489056e0916</lastEdited>
     <lastViewed>31489056e0916</lastViewed>
+    <lastWordCount>69</lastWordCount>
     <status>
       <entry blue="100" green="100" red="100">New</entry>
       <entry blue="0" green="50" red="200">Note</entry>
diff --git a/tests/reference/gui/2_nwProject.nwx b/tests/reference/gui/2_nwProject.nwx
index 02f3c384..8d2ab8f5 100644
--- a/tests/reference/gui/2_nwProject.nwx
+++ b/tests/reference/gui/2_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-22 21:35:39">
+<novelWriterXML appVersion="0.1.4" fileVersion="1.0" timeStamp="2019-05-25 23:31:12">
   <project>
     <name>Project Name</name>
     <title>Project Title</title>
@@ -10,6 +10,7 @@
     <spellCheck>False</spellCheck>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastWordCount>0</lastWordCount>
     <status>
       <entry blue="100" green="100" red="100">New</entry>
       <entry blue="0" green="50" red="200">Note</entry>
diff --git a/tests/reference/gui/3_nwProject.nwx b/tests/reference/gui/3_nwProject.nwx
index 510192ff..d499a736 100644
--- a/tests/reference/gui/3_nwProject.nwx
+++ b/tests/reference/gui/3_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-22 21:16:34">
+<novelWriterXML appVersion="0.1.4" fileVersion="1.0" timeStamp="2019-05-25 23:31:45">
   <project>
     <name></name>
     <title></title>
@@ -8,6 +8,7 @@
     <spellCheck>False</spellCheck>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastWordCount>0</lastWordCount>
     <status>
       <entry blue="100" green="100" red="100">New</entry>
       <entry blue="0" green="50" red="200">Note</entry>
diff --git a/tests/reference/novelwriter.conf b/tests/reference/novelwriter.conf
index 112f9fd8..cb999b5a 100644
--- a/tests/reference/novelwriter.conf
+++ b/tests/reference/novelwriter.conf
@@ -1,5 +1,5 @@
 [Main]
-timestamp = 2019-05-18 15:06:44
+timestamp = 2019-05-25 23:33:23
 theme = default
 
 [Sizes]
@@ -17,6 +17,7 @@ fixedwidth = True
 width = 600
 margins = 40, 40
 textsize = 13
+tabwidth = 40
 justify = True
 autoselect = True
 autoreplace = True
diff --git a/tests/reference/proj/1_nwProject.nwx b/tests/reference/proj/1_nwProject.nwx
index e9ff11f5..40ec363c 100644
--- a/tests/reference/proj/1_nwProject.nwx
+++ b/tests/reference/proj/1_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-22 20:48:51">
+<novelWriterXML appVersion="0.1.4" fileVersion="1.0" timeStamp="2019-05-25 23:25:27">
   <project>
     <name></name>
     <title></title>
@@ -8,6 +8,7 @@
     <spellCheck>False</spellCheck>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastWordCount>0</lastWordCount>
     <status>
       <entry blue="100" green="100" red="100">New</entry>
       <entry blue="0" green="50" red="200">Note</entry>
diff --git a/tests/reference/proj/2_nwProject.nwx b/tests/reference/proj/2_nwProject.nwx
index 8c68bc42..314a4f75 100644
--- a/tests/reference/proj/2_nwProject.nwx
+++ b/tests/reference/proj/2_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-22 20:52:32">
+<novelWriterXML appVersion="0.1.4" fileVersion="1.0" timeStamp="2019-05-25 23:26:15">
   <project>
     <name></name>
     <title></title>
@@ -8,6 +8,7 @@
     <spellCheck>False</spellCheck>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastWordCount>0</lastWordCount>
     <status>
       <entry blue="100" green="100" red="100">New</entry>
       <entry blue="0" green="50" red="200">Note</entry>
diff --git a/tests/test_gui.py b/tests/test_gui.py
index 94ce7eb4..261f8ebf 100644
--- a/tests/test_gui.py
+++ b/tests/test_gui.py
@@ -155,7 +155,7 @@ def testMainWindows(qtbot, nwTempGUI, nwRef):
     sceneFile = path.join(nwTempGUI,"data_3","1489056e0916_main.nwd")
     assert cmpFiles(sceneFile, path.join(nwRef,"gui","1_1489056e0916_main.nwd"))
 
-    nwGUI.closeMain(True)
+    nwGUI.closeMain()
     # qtbot.stopForInteraction()
 
 @pytest.mark.gui
@@ -217,7 +217,7 @@ def testProjectEditor(qtbot, nwTempGUI, nwRef):
     projFile = path.join(nwTempGUI,"nwProject.nwx")
     assert cmpFiles(projFile, path.join(nwRef,"gui","2_nwProject.nwx"), [2])
 
-    nwGUI.closeMain(True)
+    nwGUI.closeMain()
     # qtbot.stopForInteraction()
 
 @pytest.mark.gui
@@ -263,5 +263,5 @@ def testItemEditor(qtbot, nwTempGUI, nwRef):
     projFile = path.join(nwTempGUI,"nwProject.nwx")
     assert cmpFiles(projFile, path.join(nwRef,"gui","3_nwProject.nwx"), [2])
 
-    nwGUI.closeMain(True)
+    nwGUI.closeMain()
     # qtbot.stopForInteraction()