diff --git a/core/wiki/macros/sidebar-resizer.tid b/core/wiki/macros/sidebar-resizer.tid
index f115874a2..b694edc09 100644
--- a/core/wiki/macros/sidebar-resizer.tid
+++ b/core/wiki/macros/sidebar-resizer.tid
@@ -460,17 +460,13 @@ title: $:/core/procedures/sidebar-resizer
 
 				<% endif %>
 
-				<%if [<template>is[variable]] [<template>is[tiddler]] %>
+				<%if [<template>is[variable]] %>
 
-					<%if [<template>is[variable]] %>
+					<$transclude $variable=<<template>> mode=<<mode>>/>
 
-						<$transclude $variable=<<template>> mode=<<mode>>/>
+				<% else %>
 
-					<% else %>
-
-						<$transclude $tiddler=<<template>> mode=<<mode>>/>
-
-					<% endif %>
+					<$transclude $tiddler=<<template>> mode=<<mode>>/>
 
 				<% endif %>
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 4ff13c874..6cba192da 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1426,6 +1426,8 @@ html body.tc-body.tc-single-tiddler-window {
 */
 
 .tc-editor-toolbar {
+	background-color: <<colour tiddler-background>>;
+	z-index: 1;
 	padding-top: 8px;
 }
 
diff --git a/themes/tiddlywiki/vanilla/sidebar-resizer.tid b/themes/tiddlywiki/vanilla/sidebar-resizer.tid
index 317c0d3c2..7891d22ac 100644
--- a/themes/tiddlywiki/vanilla/sidebar-resizer.tid
+++ b/themes/tiddlywiki/vanilla/sidebar-resizer.tid
@@ -47,10 +47,6 @@ code-body: yes
 			left: 0;
 		}
 
-		.tc-editor-toolbar {
-			background-color: <<colour tiddler-background>>;
-		}
-
 		.tc-sidebar-resizer-pointermove-eventcatcher, .tc-sidebar-resizer-pointermove {
 			position: absolute;
 			top: 0;