diff --git a/core/ui/LayoutSwitcher.tid b/core/ui/LayoutSwitcher.tid
index 3bb8cba0b..f0d256294 100644
--- a/core/ui/LayoutSwitcher.tid
+++ b/core/ui/LayoutSwitcher.tid
@@ -7,7 +7,7 @@ caption: {{$:/language/ControlPanel/LayoutSwitcher/Caption}}
\procedure layout-item()
>>
- <$link to={{!!title}}>
+ <$link to={{!!title}} tabindex=<>>
''<$transclude tiddler={{{ [get[icon]] }}}/><$transclude field="name"/>'' - <$transclude field="description"/>
$link>
@@ -23,7 +23,7 @@ caption: {{$:/language/ControlPanel/LayoutSwitcher/Caption}}
<$keyboard key="((input-up))" actions=<>>
<$keyboard key="((input-down))" actions=<>>
- <$list filter=<>>
+ <$list filter=<> counter="tabIndex">
<% if [{$:/layout}has[text]] %>
<$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
<>