diff --git a/src/components/popover/blank.hbs b/src/components/popover/blank.hbs
index 643e48b07..7bff40a31 100644
--- a/src/components/popover/blank.hbs
+++ b/src/components/popover/blank.hbs
@@ -9,7 +9,7 @@ page: true
 
 <div class="nsw-list nsw-list--8">
   {{#each model.top}}
-{{>_popover style="dark" icon="expand_less" icon-after="true" text=this id=@index position=@key gap="10"}}
+{{>_popover style="dark" icon="expand_less" icon-after="true" text=this id=@key position=@key gap="10"}}
   {{/each}}
 </div>
 
@@ -17,7 +17,7 @@ page: true
 
 <div class="nsw-list nsw-list--8">
   {{#each model.right}}
-{{>_popover style="dark" icon="chevron_right" icon-after="true" text=this id=@index position=@key gap="10"}}
+{{>_popover style="dark" icon="chevron_right" icon-after="true" text=this id=@key position=@key gap="10"}}
   {{/each}}
 </div>
 
@@ -25,7 +25,7 @@ page: true
 
 <div class="nsw-list nsw-list--8">
   {{#each model.bottom}}
-{{>_popover style="dark" icon="expand_more" icon-after="true" text=this id=@index position=@key gap="10"}}
+{{>_popover style="dark" icon="expand_more" icon-after="true" text=this id=@key position=@key gap="10"}}
   {{/each}}
 </div>
 
@@ -33,7 +33,7 @@ page: true
 
 <div class="nsw-list nsw-list--8">
   {{#each model.left}}
-{{>_popover style="dark" icon="expand_more" icon-after="true" text=this id=@index position=@key gap="10"}}
+{{>_popover style="dark" icon="expand_more" icon-after="true" text=this id=@key position=@key gap="10"}}
   {{/each}}
 </div>
 {{/_layout-container}}
\ No newline at end of file
diff --git a/src/components/popover/index.hbs b/src/components/popover/index.hbs
index 42309129e..2523b7072 100644
--- a/src/components/popover/index.hbs
+++ b/src/components/popover/index.hbs
@@ -13,7 +13,7 @@ meta-index: true
 {{#>_docs-example separated="true"}}
 <div class="nsw-list nsw-list--8">
   {{#each model.top}}
-{{>_popover style="dark" icon="expand_less" icon-after="true" text=this id=@index position=@key gap="10"}}
+{{>_popover style="dark" icon="expand_less" icon-after="true" text=this id=@key position=@key gap="10"}}
   {{/each}}
 </div>
 {{/_docs-example}}
@@ -22,7 +22,7 @@ meta-index: true
 {{#>_docs-example separated="true"}}
 <div class="nsw-list nsw-list--8">
   {{#each model.right}}
-{{>_popover style="dark" icon="chevron_right" icon-after="true" text=this id=@index position=@key gap="10"}}
+{{>_popover style="dark" icon="chevron_right" icon-after="true" text=this id=@key position=@key gap="10"}}
   {{/each}}
 </div>
 {{/_docs-example}}
@@ -31,7 +31,7 @@ meta-index: true
 {{#>_docs-example separated="true"}}
 <div class="nsw-list nsw-list--8">
   {{#each model.bottom}}
-{{>_popover style="dark" icon="expand_more" icon-after="true" text=this id=@index position=@key gap="10"}}
+{{>_popover style="dark" icon="expand_more" icon-after="true" text=this id=@key position=@key gap="10"}}
   {{/each}}
 </div>
 {{/_docs-example}}
@@ -40,7 +40,7 @@ meta-index: true
 {{#>_docs-example separated="true"}}
 <div class="nsw-list nsw-list--8">
   {{#each model.left}}
-{{>_popover style="dark" icon="expand_more" icon-after="true" text=this id=@index position=@key gap="10"}}
+{{>_popover style="dark" icon="expand_more" icon-after="true" text=this id=@key position=@key gap="10"}}
   {{/each}}
 </div>
 {{/_docs-example}}
\ No newline at end of file