diff --git a/docs/content/extras/menus.md b/docs/content/extras/menus.md
index 05d40e5f9..9daaff609 100644
--- a/docs/content/extras/menus.md
+++ b/docs/content/extras/menus.md
@@ -1,7 +1,6 @@
 ---
 date: 2014-05-14T02:36:37Z
 toc: true
-tocstyle: compact
 menu:
   main:
     parent: extras
diff --git a/docs/content/extras/shortcodes.md b/docs/content/extras/shortcodes.md
index 790fba970..4ef7ec81f 100644
--- a/docs/content/extras/shortcodes.md
+++ b/docs/content/extras/shortcodes.md
@@ -10,7 +10,6 @@ prev: /extras/permalinks
 title: Shortcodes
 weight: 80
 toc: true
-tocstyle: compact
 ---
 
 Hugo uses Markdown for its simple content format. However, there are a lot
diff --git a/docs/content/tutorials/creating-a-new-theme.md b/docs/content/tutorials/creating-a-new-theme.md
index 4113636ad..6dcc16bed 100644
--- a/docs/content/tutorials/creating-a-new-theme.md
+++ b/docs/content/tutorials/creating-a-new-theme.md
@@ -3,7 +3,6 @@ author: "Michael Henderson"
 date: 2014-09-28
 linktitle: Creating a New Theme
 toc: true
-tocstyle: compact
 menu:
   main:
     parent: tutorials
diff --git a/docs/content/tutorials/migrate-from-jekyll.md b/docs/content/tutorials/migrate-from-jekyll.md
index 1dd5fd324..d5975de8f 100644
--- a/docs/content/tutorials/migrate-from-jekyll.md
+++ b/docs/content/tutorials/migrate-from-jekyll.md
@@ -2,7 +2,6 @@
 date: 2014-03-10
 linktitle: Migrating from Jekyll
 toc: true
-tocstyle: compact
 menu:
   main:
     parent: tutorials
diff --git a/docs/layouts/_default/single.html b/docs/layouts/_default/single.html
index 864b37b8e..702014061 100644
--- a/docs/layouts/_default/single.html
+++ b/docs/layouts/_default/single.html
@@ -3,8 +3,8 @@
 <div class="col-lg-8 col-md-12">
 {{ .Content }}
 </div>
-<div id="toc" class="col-lg-offset-6 toc {{ with .Params.tocstyle }}{{ . }}{{ end }}">
-{{ .TableOfContents }}
+<div id="toc" class="col-lg-offset-6 toc {{ if gt (len .TableOfContents) 2500 }}compact{{ end }}">
+    {{ .TableOfContents }}
 </div>
 {{ else }}
 {{ .Content }}