diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid
index 4d1a9dfc0..4b49ac4b9 100644
--- a/core/wiki/macros/tabs.tid
+++ b/core/wiki/macros/tabs.tid
@@ -4,17 +4,13 @@ tags: $:/tags/Macro
 \define tabs(tabsList,default,state:"$:/state/tab",class,template)
 <div class="tc-tab-set $class$">
 <div class="tc-tab-buttons $class$">
-<$list filter="$tabsList$ +[nsort[order]]" variable="currentTab">
-<$tiddler tiddler=<<currentTab>> >
-<$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tc-tab-selected" tooltip={{!!tooltip}}>
+<$list filter="$tabsList$ +[nsort[order]]" variable="currentTab"><$tiddler tiddler=<<currentTab>> ><$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tc-tab-selected" tooltip={{!!tooltip}}>
 <$set name="tv-wikilinks" value="no">
 <$transclude tiddler=<<currentTab>> field="caption">
 <$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
 </$transclude>
 </$set>
-</$button>
-</$tiddler>
-</$list>
+</$button></$tiddler></$list>
 </div><div class="tc-tab-divider $class$"/><div class="tc-tab-content $class$">
 <$list filter="$tabsList$" variable="currentTab">
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index b809ba9dc..35d969209 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1472,6 +1472,7 @@ html body.tc-body.tc-single-tiddler-window {
 .tc-tab-buttons button {
 	color: <<colour tab-foreground>>;
 	padding: 3px 5px 3px 5px;
+	margin-right: 0.3em;
 	font-weight: 300;
 	border: none;
 	background: inherit;
@@ -1487,6 +1488,7 @@ html body.tc-body.tc-single-tiddler-window {
 	display: block;
 	width: 100%;
 	margin-top: 3px;
+	margin-right: 0;
 	text-align: right;
 	background-color: <<colour tab-background>>;
 	border-left: 1px solid <<colour tab-border>>;