diff --git a/src/lib/preview/Preview.svelte b/src/lib/preview/Preview.svelte
index 62c9748..cdaef96 100644
--- a/src/lib/preview/Preview.svelte
+++ b/src/lib/preview/Preview.svelte
@@ -1,8 +1,8 @@
+
+{#if templates[templateIndex] && $title}
+
+ {$title}
+
+{/if}
+
+
diff --git a/src/lib/templates/heading.svelte b/src/lib/templates/heading.svelte
index 9ce4ef7..4665b4a 100644
--- a/src/lib/templates/heading.svelte
+++ b/src/lib/templates/heading.svelte
@@ -6,20 +6,22 @@
import { heading } from '$lib/stores/store';
-
- {$heading}
-
+{#if $heading && templates[templateIndex].heading}
+
+ {$heading}
+
+{/if}