diff --git a/layouts/partials/shortcodes/expand.html b/layouts/partials/shortcodes/expand.html
index cbf1fc117b..3b30bd2fe0 100644
--- a/layouts/partials/shortcodes/expand.html
+++ b/layouts/partials/shortcodes/expand.html
@@ -16,6 +16,7 @@
         {{ $title | .RenderString }}
     </label>
     <div id="expandcontent-{{ $id }}" class="expand-content">
+{{ if ne "<" (substr (strings.TrimLeft " " $content) 0 1) }}<p>{{ end }}<!-- we add a DOM element here if there is none to make collapsing marings work -->
 {{ $content | safeHTML }}</div><!-- no line break allowed here because of awkward behavior of Hugo 110 or this theme when tag shortcode is called standalone outside of tags shortcode ? -->
 </div>
 {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/shortcodes/notice.html b/layouts/partials/shortcodes/notice.html
index 7a49182aa0..5bacde9cc7 100644
--- a/layouts/partials/shortcodes/notice.html
+++ b/layouts/partials/shortcodes/notice.html
@@ -19,6 +19,7 @@
 <div class="box notices cstyle {{ $style }}"{{ if $color }} style="--VARIABLE-BOX-color: {{ $color }};"{{ end }}>
   <div class="box-label">{{ if $icon }}<i class="{{ $icon }}"></i>{{ end }}{{ if and $icon $title }} {{ end }}{{ $title | .RenderString }}</div>
   <div class="box-content">
+{{ if ne "<" (substr (strings.TrimLeft " " $content) 0 1) }}<p>{{ end }}<!-- we add a DOM element here if there is none to make collapsing marings work -->
 {{ $content | safeHTML }}</div><!-- no line break allowed here because of awkward behavior of Hugo 110 or this theme when tag shortcode is called standalone outside of tags shortcode ? -->
 </div>
 {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/shortcodes/tabs.html b/layouts/partials/shortcodes/tabs.html
index 9e936f351a..f356ac46f7 100644
--- a/layouts/partials/shortcodes/tabs.html
+++ b/layouts/partials/shortcodes/tabs.html
@@ -19,6 +19,7 @@
       data-tab-item="{{ .name | $context.RenderString | plainify }}"
       class="tab-content-text{{ cond (eq $idx 0) " active" ""}}"
     >
+{{ if ne "<" (substr (strings.TrimLeft " " .content) 0 1) }}<p>{{ end }}<!-- we add a DOM element here if there is none to make collapsing marings work -->
 {{ .content | safeHTML }}</div><!-- no line break allowed here because of awkward behavior of Hugo 110 or this theme when tag shortcode is called standalone outside of tags shortcode ? -->
     {{- end }}
   </div>
diff --git a/static/css/theme.css b/static/css/theme.css
index d4342384cb..3769509856 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -444,7 +444,9 @@ div.box > .box-content {
 #body table td > :first-child,
 #body table td > :first-child :first-child,
 #body div.box > .box-content > :first-child,
-#body div.box > .box-content > :first-child :first-child {
+#body div.box > .box-content > :first-child :first-child,
+#body div.tab-content > .tab-content-text > :first-child,
+#body div.tab-content > .tab-content-text > :first-child :first-child {
     margin-top: 0;
 }
 
@@ -453,7 +455,9 @@ div.box > .box-content {
 #body table td > :last-child,
 #body table td > :last-child :last-child,
 #body div.box > .box-content > :last-child,
-#body div.box > .box-content > :last-child :last-child {
+#body div.box > .box-content > :last-child :last-child,
+#body div.tab-content > .tab-content-text > :last-child,
+#body div.tab-content > .tab-content-text > :last-child :last-child {
     margin-bottom: 0;
 }