diff --git a/package.json b/package.json
index 2028258ac..7cd1987a3 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "plottr",
-  "version": "2020.5.2",
+  "version": "2020.5.3",
   "description": "An elegant writing tool that helps organize plotlines",
   "repository": "https://github.com/cameronsutter/plottr_electron.git",
-  "homepage": "www.getplottr.com",
+  "homepage": "getplottr.com",
   "private": true,
   "readme": "Copyright 2016-2020 C. Louis S. (Cameron Sutter)",
   "author": {
diff --git a/src/app/components/characters/characterListView.js b/src/app/components/characters/characterListView.js
index 175892301..f4ce78c99 100644
--- a/src/app/components/characters/characterListView.js
+++ b/src/app/components/characters/characterListView.js
@@ -269,6 +269,8 @@ class CharacterListView extends Component {
   }
 
   renderTemplatePicker () {
+    if (!this.state.showTemplatePicker) return null
+
     return <TemplatePicker
       modal={true}
       type='characters'
diff --git a/src/app/components/timeline/AddLineRow.js b/src/app/components/timeline/AddLineRow.js
index 6cb778d43..f6ac29357 100644
--- a/src/app/components/timeline/AddLineRow.js
+++ b/src/app/components/timeline/AddLineRow.js
@@ -174,6 +174,8 @@ class AddLineRow extends Component {
   }
 
   renderTemplatePicker () {
+    if (!this.state.showTemplatePicker) return null
+
     return <TemplatePicker
       type='plotlines'
       modal={true}
diff --git a/src/common/utils/templates.js b/src/common/utils/templates.js
index 45ccb76da..6f3abaaef 100644
--- a/src/common/utils/templates.js
+++ b/src/common/utils/templates.js
@@ -6,6 +6,7 @@ const TEMPLATES_ROOT = 'templates'
 
 export default function listTemplates (type) {
   const templatesById = templateStore.get(TEMPLATES_ROOT)
+  if (!templatesById) return []
   if (!type) return Object.values(templatesById)
 
   const ids = Object.keys(templatesById)