diff --git a/exampleSite/content/post/multiple-expandable-test.md b/exampleSite/content/post/multiple-expandable-test.md
new file mode 100644
index 0000000..ad12612
--- /dev/null
+++ b/exampleSite/content/post/multiple-expandable-test.md
@@ -0,0 +1,19 @@
+---
+title: "Multiple Expandable Test"
+date: 2020-06-17T22:01:14-05:00
+tags: [issue]
+---
+
+Testing out GitHub issue https://github.com/zwbetz-gh/cupper-hugo-theme/issues/36 -- Multiple expandable shortcodes do not work if they have the same inner text.
+
+{{< expandable label="expandable 1" level="2" >}}
+Same inner text.
+{{< /expandable >}}
+
+{{< expandable label="expandable 2" level="2" >}}
+Same inner text.
+{{< /expandable >}}
+
+{{< expandable label="expandable 3" level="2" >}}
+Different inner text.
+{{< /expandable >}}
diff --git a/exampleSite/content/post/special-character-test.md b/exampleSite/content/post/special-character-test.md
index 5c5a81a..86b4ed1 100644
--- a/exampleSite/content/post/special-character-test.md
+++ b/exampleSite/content/post/special-character-test.md
@@ -1,7 +1,7 @@
---
title: "Special Character Test"
date: 2019-09-10T20:26:08-05:00
-tags: []
+tags: [issue]
---
Testing out GitHub issue https://github.com/zwbetz-gh/cupper-hugo-theme/issues/16
diff --git a/layouts/shortcodes/expandable.html b/layouts/shortcodes/expandable.html
index b1eee0c..5b752a9 100644
--- a/layouts/shortcodes/expandable.html
+++ b/layouts/shortcodes/expandable.html
@@ -2,7 +2,12 @@
{{ if .Get "level" }}