diff --git a/core/modules/parsers/wikiparser/rules/html.js b/core/modules/parsers/wikiparser/rules/html.js
index 0d294a989..f0d6aef92 100644
--- a/core/modules/parsers/wikiparser/rules/html.js
+++ b/core/modules/parsers/wikiparser/rules/html.js
@@ -359,7 +359,7 @@ exports.parseTag = function(source,pos,options) {
 	pos = token.end;
 	// Check for a required line break
 	if(options.requireLineBreak) {
-		token = this.parseTokenRegExp(source,pos,/(\r?\n)/g);
+		token = this.parseTokenRegExp(source,pos,/(\r?\n\r?\n)/g);
 		if(!token) {
 			return null;
 		}
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index b2c0bdf69..80b5db043 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -11,11 +11,17 @@ background-color:$(backgroundColor)$;
 <div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class=""><<lingo Tags/Add/Button>></$button></span></div>
 
 <div class="tw-block-dropdown-wrapper">
+
 <$reveal state=<<qualify "$:/state/tagsAutoComplete">> type="nomatch" text="" default="">
+
 <div class="tw-block-dropdown">
-<$linkcatcher set="$:/temp/NewTagName" setTo="" message="tw-add-tag"><$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]"><$link><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text"/></span></$set></$link>
+
+<$linkcatcher set="$:/temp/NewTagName" setTo="" message="tw-add-tag">
+<$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]">
+<$link><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text"/></span></$set></$link>
 </$list>
 </$linkcatcher>
+
 </div>
 
 </$reveal>
diff --git a/core/ui/PageMacros.tid b/core/ui/PageMacros.tid
index e86f9922e..8aec1f640 100644
--- a/core/ui/PageMacros.tid
+++ b/core/ui/PageMacros.tid
@@ -17,6 +17,7 @@ title: $:/core/ui/PageMacros
 <$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
 
 <$transclude tiddler=<<currentTab>>/>
+
 </$reveal>
 </$list>
 </div>