diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f1e69a67..a90a6bcf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -535,6 +535,7 @@ jobs:
         if: ${{ github.repository == 'keeweb/keeweb' }}
         run: gsutil -m rsync -r -d -x "^\." gh-pages gs://app.keeweb.info/
       - name: Purge CloudFlare cache
+        if: ${{ github.repository == 'keeweb/keeweb' }}
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
         run: |
diff --git a/app/scripts/views/details/details-view.js b/app/scripts/views/details/details-view.js
index 11b9bb18..e1070215 100644
--- a/app/scripts/views/details/details-view.js
+++ b/app/scripts/views/details/details-view.js
@@ -156,11 +156,19 @@ class DetailsView extends View {
                 if (hideEmptyFields) {
                     const value = fieldView.model.value();
                     if (!value || value.length === 0 || value.byteLength === 0) {
-                        if (
-                            this.model.isJustCreated &&
-                            ['$UserName', '$Password'].indexOf(fieldView.model.name) >= 0
-                        ) {
-                            return; // don't hide user for new records
+                        if (this.model.isJustCreated) {
+                            const fieldsHiddenForNewEntriesWhenEmpty = [
+                                '$URL',
+                                '$Notes',
+                                'Tags',
+                                'Expires',
+                                'History'
+                            ];
+                            if (
+                                !fieldsHiddenForNewEntriesWhenEmpty.includes(fieldView.model.name)
+                            ) {
+                                continue;
+                            }
                         }
                         fieldView.hide();
                     }
diff --git a/app/scripts/views/list-view.js b/app/scripts/views/list-view.js
index eac876cd..a52bc85a 100644
--- a/app/scripts/views/list-view.js
+++ b/app/scripts/views/list-view.js
@@ -180,7 +180,7 @@ class ListView extends View {
     }
 
     createTemplate() {
-        if (!this.model.settings.templateHelpShown_) {
+        if (!this.model.settings.templateHelpShown) {
             Alerts.yesno({
                 icon: 'sticky-note-o',
                 header: Locale.listAddTemplateHeader,
diff --git a/desktop/app.js b/desktop/app.js
index 202227eb..859d37cf 100644
--- a/desktop/app.js
+++ b/desktop/app.js
@@ -125,7 +125,7 @@ app.on('activate', () => {
     }
 });
 app.on('before-quit', (e) => {
-    if (app.hookBeforeQuitEvent) {
+    if (app.hookBeforeQuitEvent && mainWindow) {
         e.preventDefault();
         emitRemoteEvent('launcher-before-quit');
     }
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index 0c483668..a41e82b2 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.15.4",
+  "version": "1.15.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/desktop/package.json b/desktop/package.json
index 789cd50b..37878ead 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
     "name": "KeeWeb",
-    "version": "1.15.4",
+    "version": "1.15.6",
     "description": "Free cross-platform password manager compatible with KeePass",
     "main": "main.js",
     "homepage": "https://keeweb.info",
diff --git a/package-lock.json b/package-lock.json
index a7c376f0..4c559d87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.15.4",
+  "version": "1.15.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a491e18d..62181295 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "keeweb",
-    "version": "1.15.4",
+    "version": "1.15.6",
     "description": "Free cross-platform password manager compatible with KeePass",
     "main": "Gruntfile.js",
     "private": true,
diff --git a/release-notes.md b/release-notes.md
index 450f60f2..fddbd7da 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,6 +1,7 @@
 Release notes
 -------------
-##### v1.16.0 (TBD)
+##### v1.15.6 (2020-08-08)
+`-` fix #1553: empty fields display for templates  
 `-` fix #1581: double-clicking KeeWeb icon in Dock  
 
 ##### v1.15.5 (2020-06-13)