diff --git a/layouts/shortcodes/list_categories.html b/layouts/shortcodes/list_categories.html
new file mode 100644
index 00000000..0131f8e4
--- /dev/null
+++ b/layouts/shortcodes/list_categories.html
@@ -0,0 +1,5 @@
+<ul class="list-unstyled">
+  {{ range ($.Site.GetPage "taxonomyTerm" "categories").Pages }}
+  <li><a href="{{.Permalink}}">{{.Title}}</a></li>
+  {{ end }}
+</ul>
\ No newline at end of file
diff --git a/layouts/shortcodes/list_tags.html b/layouts/shortcodes/list_tags.html
new file mode 100644
index 00000000..03537f19
--- /dev/null
+++ b/layouts/shortcodes/list_tags.html
@@ -0,0 +1,5 @@
+<ul class="list-unstyled">
+  {{ range ($.Site.GetPage "taxonomyTerm" "tags").Pages }}
+  <li><a href="{{.Permalink}}">{{.Title}}</a></li>
+  {{ end }}
+</ul>
\ No newline at end of file