diff --git a/core/ui/ViewTemplate/subtitle/default.tid b/core/ui/ViewTemplate/subtitle/default.tid
index 99042c95e..5c55712fa 100644
--- a/core/ui/ViewTemplate/subtitle/default.tid
+++ b/core/ui/ViewTemplate/subtitle/default.tid
@@ -4,7 +4,7 @@ title: $:/core/ui/ViewTemplate/subtitle/default
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-subtitle tc-clearfix">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler">
-<$transclude tiddler=<<subtitleTiddler>> mode="inline"/><$list-join>&nbsp;</$list-join>
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/>
 </$list>
 </div>
 </$reveal>
diff --git a/core/ui/ViewTemplate/subtitle/modifier.tid b/core/ui/ViewTemplate/subtitle/modifier.tid
index 8437ada9b..e4062380d 100644
--- a/core/ui/ViewTemplate/subtitle/modifier.tid
+++ b/core/ui/ViewTemplate/subtitle/modifier.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/ViewTemplate/subtitle/modifier
 tags: $:/tags/ViewTemplate/Subtitle
 
-<$link to={{!!modifier}}/>
\ No newline at end of file
+<%if [{!!modifier}!is[blank]] %><$link to={{!!modifier}}/><%endif%>
\ No newline at end of file