diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html
index 4de845a773..762a88de14 100644
--- a/layouts/shortcodes/expand.html
+++ b/layouts/shortcodes/expand.html
@@ -5,7 +5,7 @@
 <div class="expand
     {{- if $expanded }} expand-expanded{{ end -}}
 ">
-    {{/* things are getting complicated when search tries to open the expand box while jquery sets the display CSS on the element */}}
+    {{/* things are getting complicated when search tries to open the expand box while jquery sets the display CSS on the element */}}{{ "" -}}
     <a class="expand-label" onclick="$t=$(this); if($t.parent('.expand-expanded.expand-marked').length){ $t.next().css('display','none') }else if($t.parent('.expand-marked').length){ $t.next().css('display','block') }else{ $t.next('.expand-content').slideToggle(100); } $t.parent().toggleClass('expand-expanded');">
         <i class="fas fa-chevron-down"></i>
         <i class="fas fa-chevron-right"></i>
@@ -14,6 +14,6 @@
     <div class="expand-content" style="display:
         {{- if $expanded }} block{{ else }} none{{ end -}}
     ;">
-        {{ $content }}
+{{ $content }}
     </div>
 </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/notice.html b/layouts/shortcodes/notice.html
index c8f773d44e..85c91a5708 100644
--- a/layouts/shortcodes/notice.html
+++ b/layouts/shortcodes/notice.html
@@ -3,5 +3,5 @@
 {{- $title := .Get 1 | default ($style | T) }}
 <div class="notices {{ $style }}">
     <div class="label">{{ $title }}</div>
-    {{- .Inner }}
+{{ .Inner -}}
 </div>
\ No newline at end of file