diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid
index da07dd2ee..4d1a9dfc0 100644
--- a/core/wiki/macros/tabs.tid
+++ b/core/wiki/macros/tabs.tid
@@ -4,14 +4,16 @@ 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$" variable="currentTab">
-<$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tc-tab-selected">
+<$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>
 </div><div class="tc-tab-divider $class$"/><div class="tc-tab-content $class$">
 <$list filter="$tabsList$" variable="currentTab">