diff --git a/website/helpers/sidebar_helpers.rb b/website/helpers/sidebar_helpers.rb
index 124a7c53c..ef74de49c 100644
--- a/website/helpers/sidebar_helpers.rb
+++ b/website/helpers/sidebar_helpers.rb
@@ -3,7 +3,7 @@ module SidebarHelpers
   # if the YAML frontmatter matches the expected value.
   def sidebar_current(expected)
     current = current_page.data.sidebar_current || ""
-    if current.start_with?(expected)
+    if current == expected or (expected.is_a?(Regexp) and expected.match(current))
       return " class=\"active\""
     else
       return ""
diff --git a/website/source/layouts/atlas.erb b/website/source/layouts/atlas.erb
index 65e1241b7..8df8365e3 100644
--- a/website/source/layouts/atlas.erb
+++ b/website/source/layouts/atlas.erb
@@ -10,7 +10,7 @@
 				<a href="/docs/providers/atlas/index.html">Atlas Provider</a>
                 </li>
 
-				<li<%= sidebar_current("docs-atlas-resource") %>>
+				<li<%= sidebar_current(/^docs-atlas-resource/) %>>
 				<a href="#">Resources</a>
                 <ul class="nav nav-visible">
                     <li<%= sidebar_current("docs-atlas-resource-artifact") %>>
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index bb644a0bb..4c77e59e6 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -10,7 +10,7 @@
 					<a href="/docs/providers/aws/index.html">AWS Provider</a>
 				</li>
 
-				<li<%= sidebar_current("docs-aws-resource") %>>
+				<li<%= sidebar_current(/^docs-aws-resource/) %>>
 					<a href="#">Resources</a>
 					<ul class="nav nav-visible">
 						<li<%= sidebar_current("docs-aws-resource-autoscale") %>>
diff --git a/website/source/layouts/cloudflare.erb b/website/source/layouts/cloudflare.erb
index d30ce6db5..71364951d 100644
--- a/website/source/layouts/cloudflare.erb
+++ b/website/source/layouts/cloudflare.erb
@@ -10,7 +10,7 @@
 				<a href="/docs/providers/cloudflare/index.html">CloudFlare Provider</a>
                 </li>
 
-				<li<%= sidebar_current("docs-cloudflare-resource") %>>
+				<li<%= sidebar_current(/^docs-cloudflare-resource/) %>>
 				<a href="#">Resources</a>
                 <ul class="nav nav-visible">
                     <li<%= sidebar_current("docs-cloudflare-resource-record") %>>
diff --git a/website/source/layouts/cloudstack.erb b/website/source/layouts/cloudstack.erb
index 1d727650f..d9830586c 100644
--- a/website/source/layouts/cloudstack.erb
+++ b/website/source/layouts/cloudstack.erb
@@ -10,7 +10,7 @@
                     <a href="/docs/providers/cloudstack/index.html">CloudStack Provider</a>
                 </li>
 
-                <li<%= sidebar_current("docs-cloudstack-resource") %>>
+                <li<%= sidebar_current(/^docs-cloudstack-resource/) %>>
                     <a href="#">Resources</a>
                     <ul class="nav nav-visible">
                         <li<%= sidebar_current("docs-cloudstack-resource-disk") %>>
diff --git a/website/source/layouts/consul.erb b/website/source/layouts/consul.erb
index 012bc4d5c..d9ca73e3c 100644
--- a/website/source/layouts/consul.erb
+++ b/website/source/layouts/consul.erb
@@ -10,7 +10,7 @@
 				<a href="/docs/providers/consul/index.html">Consul Provider</a>
                 </li>
 
-				<li<%= sidebar_current("docs-consul-resource") %>>
+				<li<%= sidebar_current(/^docs-consul-resource/) %>>
 				<a href="#">Resources</a>
                 <ul class="nav nav-visible">
                     <li<%= sidebar_current("docs-consul-resource-keys") %>>
diff --git a/website/source/layouts/digitalocean.erb b/website/source/layouts/digitalocean.erb
index 63d97742a..42ede7db3 100644
--- a/website/source/layouts/digitalocean.erb
+++ b/website/source/layouts/digitalocean.erb
@@ -10,7 +10,7 @@
 				<a href="/docs/providers/do/index.html">DigitalOcean Provider</a>
                 </li>
 
-				<li<%= sidebar_current("docs-do-resource") %>>
+				<li<%= sidebar_current(/^docs-do-resource/) %>>
 				<a href="#">Resources</a>
                 <ul class="nav nav-visible">
                     <li<%= sidebar_current("docs-do-resource-domain") %>>
diff --git a/website/source/layouts/dme.erb b/website/source/layouts/dme.erb
index f1adf54d7..e3bd4558e 100644
--- a/website/source/layouts/dme.erb
+++ b/website/source/layouts/dme.erb
@@ -10,7 +10,7 @@
                 <a href="/docs/providers/dme/index.html">DNSMadeEasy Provider</a>
                 </li>
 
-                <li<%= sidebar_current("docs-dme-resource") %>>
+                <li<%= sidebar_current(/^docs-dme-resource/) %>>
                 <a href="#">Resources</a>
                 <ul class="nav nav-visible">
                     <li<%= sidebar_current("docs-dme-resource-record") %>>
diff --git a/website/source/layouts/dnsimple.erb b/website/source/layouts/dnsimple.erb
index fcf9074a3..531d15446 100644
--- a/website/source/layouts/dnsimple.erb
+++ b/website/source/layouts/dnsimple.erb
@@ -10,7 +10,7 @@
 				<a href="/docs/providers/dnsimple/index.html">DNSimple Provider</a>
                 </li>
 
-				<li<%= sidebar_current("docs-dnsimple-resource") %>>
+				<li<%= sidebar_current(/^docs-dnsimple-resource/) %>>
 				<a href="#">Resources</a>
                 <ul class="nav nav-visible">
                     <li<%= sidebar_current("docs-dnsimple-resource-record") %>>
diff --git a/website/source/layouts/docker.erb b/website/source/layouts/docker.erb
index 6e39096b9..5bb5a1514 100644
--- a/website/source/layouts/docker.erb
+++ b/website/source/layouts/docker.erb
@@ -10,7 +10,7 @@
 					<a href="/docs/providers/docker/index.html">Docker Provider</a>
 				</li>
 
-				<li<%= sidebar_current("docs-docker-resource") %>>
+				<li<%= sidebar_current(/^docs-docker-resource/) %>>
 					<a href="#">Resources</a>
 					<ul class="nav nav-visible">
 						<li<%= sidebar_current("docs-docker-resource-container") %>>
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 493dc6816..c7a3d711b 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -6,7 +6,7 @@
 				<a href="/docs/index.html">Documentation Home</a>
                 </li>
 
-				<li<%= sidebar_current("docs-config") %>>
+				<li<%= sidebar_current(/^docs-config/) %>>
 				<a href="/docs/configuration/index.html">Configuration</a>
 				<ul class="nav">
 					<li<%= sidebar_current("docs-config-load") %>>
@@ -52,7 +52,7 @@
 				</ul>
 				</li>
 
-				<li<%= sidebar_current("docs-commands") %>>
+				<li<%= sidebar_current(/^docs-commands/) %>>
 				<a href="/docs/commands/index.html">Commands (CLI)</a>
 				<ul class="nav">
 					<li<%= sidebar_current("docs-commands-apply") %>>
@@ -105,7 +105,7 @@
 				</ul>
 				</li>
 
-				<li<%= sidebar_current("docs-state") %>>
+				<li<%= sidebar_current(/^docs-state/) %>>
 					<a href="/docs/state/index.html">State</a>
 					<ul class="nav">
 						<li<%= sidebar_current("docs-state-remote") %>>
@@ -114,7 +114,7 @@
 					</ul>
 				</li>
 
-				<li<%= sidebar_current("docs-providers") %>>
+				<li<%= sidebar_current(/^docs-providers/) %>>
 				<a href="/docs/providers/index.html">Providers</a>
                 <ul class="nav">
 					<li<%= sidebar_current("docs-providers-atlas") %>>
@@ -175,7 +175,7 @@
 				</ul>
 				</li>
 
-				<li<%= sidebar_current("docs-provisioners") %>>
+				<li<%= sidebar_current(/^docs-provisioners/) %>>
 				<a href="/docs/provisioners/index.html">Provisioners</a>
 				<ul class="nav">
 					<li<%= sidebar_current("docs-provisioners-connection") %>>
@@ -196,7 +196,7 @@
 				</ul>
 				</li>
 
-				<li<%= sidebar_current("docs-modules") %>>
+				<li<%= sidebar_current(/^docs-modules/) %>>
 				<a href="/docs/modules/index.html">Modules</a>
 				<ul class="nav">
 					<li<%= sidebar_current("docs-modules-usage") %>>
@@ -213,7 +213,7 @@
 				</ul>
 				</li>
 
-				<li<%= sidebar_current("docs-plugins") %>>
+				<li<%= sidebar_current(/^docs-plugins/) %>>
 				<a href="/docs/plugins/index.html">Plugins</a>
 				<ul class="nav">
 					<li<%= sidebar_current("docs-plugins-basics") %>>
@@ -226,7 +226,7 @@
 				</ul>
 				</li>
 
-				<li<%= sidebar_current("docs-internals") %>>
+				<li<%= sidebar_current(/^docs-internals/) %>>
 				<a href="/docs/internals/index.html">Internals</a>
 				<ul class="nav">
 					<li<%= sidebar_current("docs-internals-debug") %>>
diff --git a/website/source/layouts/google.erb b/website/source/layouts/google.erb
index fbf05b201..fc36ea215 100644
--- a/website/source/layouts/google.erb
+++ b/website/source/layouts/google.erb
@@ -10,7 +10,7 @@
 		<a href="/docs/providers/google/index.html">Google Provider</a>
 		</li>
 
-		<li<%= sidebar_current("docs-google-resource") %>>
+		<li<%= sidebar_current(/^docs-google-resource/) %>>
 		<a href="#">Resources</a>
 		<ul class="nav nav-visible">
 			<li<%= sidebar_current("docs-google-resource-address") %>>
diff --git a/website/source/layouts/heroku.erb b/website/source/layouts/heroku.erb
index 64eccec53..3e4ea8331 100644
--- a/website/source/layouts/heroku.erb
+++ b/website/source/layouts/heroku.erb
@@ -10,7 +10,7 @@
 				<a href="/docs/providers/heroku/index.html">Heroku Provider</a>
                 </li>
 
-				<li<%= sidebar_current("docs-heroku-resource") %>>
+				<li<%= sidebar_current(/^docs-heroku-resource/) %>>
 				<a href="#">Resources</a>
                 <ul class="nav nav-visible">
                     <li<%= sidebar_current("docs-heroku-resource-addon") %>>
diff --git a/website/source/layouts/intro.erb b/website/source/layouts/intro.erb
index 9c19a75db..294cd279f 100644
--- a/website/source/layouts/intro.erb
+++ b/website/source/layouts/intro.erb
@@ -10,7 +10,7 @@
 				<a href="/intro/use-cases.html">Use Cases</a>
 				</li>
 
-				<li<%= sidebar_current("vs-other") %>>
+				<li<%= sidebar_current(/^vs-other/) %>>
 				<a href="/intro/vs/index.html">Terraform vs. Other Software</a>
 				<ul class="nav">
 					<li<%= sidebar_current("vs-other-chef") %>>
@@ -31,7 +31,7 @@
 				</ul>
 				</li>
 
-				<li<%= sidebar_current("gettingstarted") %>>
+				<li<%= sidebar_current(/^gettingstarted/) %>>
 				<a href="/intro/getting-started/install.html">Getting Started</a>
 				<ul class="nav">
 					<li<%= sidebar_current("gettingstarted-install") %>>
@@ -80,7 +80,7 @@
 				</ul>
 				</li>
 
-				<li<%= sidebar_current("examples") %>>
+				<li<%= sidebar_current(/^examples/) %>>
 				<a href="/intro/examples/index.html">Example Configurations</a>
 				<ul class="nav">
 					<li<%= sidebar_current("examples-aws") %>>
diff --git a/website/source/layouts/mailgun.erb b/website/source/layouts/mailgun.erb
index ca85eb9f2..8af740c32 100644
--- a/website/source/layouts/mailgun.erb
+++ b/website/source/layouts/mailgun.erb
@@ -10,7 +10,7 @@
 				<a href="/docs/providers/mailgun/index.html">Mailgun Provider</a>
                 </li>
 
-				<li<%= sidebar_current("docs-mailgun-resource") %>>
+				<li<%= sidebar_current(/^docs-mailgun-resource/) %>>
 				<a href="#">Resources</a>
                 <ul class="nav nav-visible">
                     <li<%= sidebar_current("docs-mailgun-resource-domain") %>>
diff --git a/website/source/layouts/openstack.erb b/website/source/layouts/openstack.erb
index 4646ae904..39a54fe72 100644
--- a/website/source/layouts/openstack.erb
+++ b/website/source/layouts/openstack.erb
@@ -10,7 +10,7 @@
           <a href="/docs/providers/openstack/index.html">OpenStack Provider</a>
         </li>
 
-        <li<%= sidebar_current("docs-openstack-resource") %>>
+        <li<%= sidebar_current(/^docs-openstack-resource/) %>>
           <a href="#">Resources</a>
           <ul class="nav nav-visible">
             <li<%= sidebar_current("docs-openstack-resource-blockstorage-volume-v1") %>>
diff --git a/website/source/layouts/template.erb b/website/source/layouts/template.erb
index 05c2a4b26..e9dca7dbb 100644
--- a/website/source/layouts/template.erb
+++ b/website/source/layouts/template.erb
@@ -10,7 +10,7 @@
 					<a href="/docs/providers/template/index.html">Template Provider</a>
 				</li>
 
-				<li<%= sidebar_current("docs-template-resource") %>>
+				<li<%= sidebar_current(/^docs-template-resource/) %>>
 					<a href="#">Resources</a>
 					<ul class="nav nav-visible">
 						<li<%= sidebar_current("docs-template-resource-file") %>>