diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl
index 6d82c37c58..e9fbb67313 100644
--- a/templates/shared/combomarkdowneditor.tmpl
+++ b/templates/shared/combomarkdowneditor.tmpl
@@ -16,9 +16,11 @@ Template Attributes:
 
 	<markdown-toolbar>
 		{{if .MarkdownPreviewUrl}}
-		<div class="switch">
-			<a href="#" class="active item" data-tab-for="markdown-writer">{{ctx.Locale.Tr "write"}}</a>
-			<a href="#" class="item" data-tab-for="markdown-previewer" data-preview-url="{{.MarkdownPreviewUrl}}" data-preview-context="{{.MarkdownPreviewContext}}">{{ctx.Locale.Tr "preview"}}</a>
+		<div class="markdown-toolbar-switch">
+			<div class="switch">
+				<a href="#" class="active item" data-tab-for="markdown-writer">{{ctx.Locale.Tr "write"}}</a>
+				<a href="#" class="item" data-tab-for="markdown-previewer" data-preview-url="{{.MarkdownPreviewUrl}}" data-preview-context="{{.MarkdownPreviewContext}}">{{ctx.Locale.Tr "preview"}}</a>
+			</div>
 		</div>
 		{{end}}
 		<div class="markdown-toolbar-group">
diff --git a/web_src/css/editor/combomarkdowneditor.css b/web_src/css/editor/combomarkdowneditor.css
index a40f0c175c..b151080c64 100644
--- a/web_src/css/editor/combomarkdowneditor.css
+++ b/web_src/css/editor/combomarkdowneditor.css
@@ -11,7 +11,11 @@
   flex-wrap: wrap;
 }
 
-markdown-toolbar .switch .item {
+.markdown-toolbar-switch {
+  display: flex;
+  height: 30px;
+}
+.markdown-toolbar-switch .switch .item {
   padding: 0.25em 1em;
 }