diff --git a/plugins/tiddlywiki/text-slicer/macros.tid b/plugins/tiddlywiki/text-slicer/macros.tid
index cd76b4a48..bcba9bc62 100644
--- a/plugins/tiddlywiki/text-slicer/macros.tid
+++ b/plugins/tiddlywiki/text-slicer/macros.tid
@@ -1,21 +1,25 @@
 title: $:/plugins/tiddlywiki/text-slicer/macros
 tags: $:/tags/Macro
 
+\define display-tiddler()
+<$list filter="[draft.of<currentTiddler>limit[1]]" editTemplate="$:/core/ui/EditTemplate" emptyMessage="""<$transclude mode='block'/>"""/>
+\end
+
 \define display-heading-tiddler(level:"h1")
 <$level$><$view field="title"/></$level$>
-<$list filter='[tag<currentTiddler>]'>
+<$list filter='[tag<currentTiddler>!has[draft.of]]'>
 <$tiddler>
-<$transclude mode='block'/>
+<<display-tiddler>>
 </$tiddler>
 </$list>
 \end
 
 \define display-list-tiddler(type:"ol")
 <$type$>
-<$list filter='[tag<currentTiddler>]'>
+<$list filter='[tag<currentTiddler>!has[draft.of]]'>
 <li>
 <$tiddler>
-<$transclude mode='block'/>
+<<display-tiddler>>
 </$tiddler>
 </li>
 </$list>