diff --git a/website/source/docs/providers/aws/r/elastic_beanstalk_configuration_template.html.markdown b/website/source/docs/providers/aws/r/elastic_beanstalk_configuration_template.html.markdown
index 3ca4e7da8..02d0be496 100644
--- a/website/source/docs/providers/aws/r/elastic_beanstalk_configuration_template.html.markdown
+++ b/website/source/docs/providers/aws/r/elastic_beanstalk_configuration_template.html.markdown
@@ -1,7 +1,7 @@
 ---
 layout: "aws"
 page_title: "AWS: aws_elastic_beanstalk_configuration_template"
-sidebar_current: "docs-aws-resource-elastic-configuration-template"
+sidebar_current: "docs-aws-resource-elastic-beanstalk-configuration-template"
 description: |-
   Provides an Elastic Beanstalk Configuration Template
 ---
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index 32d577ceb..b1277b827 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -132,7 +132,7 @@
                 </li>
 
 
-                <li<%= sidebar_current(/^docs-aws-resource-(ami|app|autoscaling|ebs|elb|eip|elastic-beanstalk|instance|launch|lb|proxy|spot|volume|placement|key-pair)/) %>>
+                <li<%= sidebar_current(/^docs-aws-resource-(ami|app|autoscaling|ebs|elb|eip|instance|launch|lb|proxy|spot|volume|placement|key-pair)/) %>>
                     <a href="#">EC2 Resources</a>
                     <ul class="nav nav-visible">
 
@@ -184,18 +184,6 @@
                             <a href="/docs/providers/aws/r/elb.html">aws_elb</a>
                         </li>
 
-                        <li<%= sidebar_current("docs-aws-resource-elastic-beanstalk-application") %>>
-                            <a href="/docs/providers/aws/r/elastic_beanstalk_application.html">aws_elastic_beanstalk_application</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-aws-resource-elastic-beanstalk-configuration-template") %>>
-                            <a href="/docs/providers/aws/r/elastic_beanstalk_configuration_template.html">aws_elastic_configuation_template</a>
-                        </li>
-
-                        <li<%= sidebar_current("docs-aws-resource-elastic-beanstalk-environment") %>>
-                            <a href="/docs/providers/aws/r/elastic_beanstalk_environment.html">aws_elastic_beanstalk_environment</a>
-                        </li>
-
                         <li<%= sidebar_current("docs-aws-resource-instance") %>>
                             <a href="/docs/providers/aws/r/instance.html">aws_instance</a>
                         </li>
@@ -299,6 +287,23 @@
                 </li>
 
 
+                <li<%= sidebar_current(/^docs-aws-resource-elastic-beanstalk/) %>>
+                    <a href="#">Elastic Beanstalk Resources</a>
+                    <ul class="nav nav-visible">
+                        <li<%= sidebar_current("docs-aws-resource-elastic-beanstalk-application") %>>
+                            <a href="/docs/providers/aws/r/elastic_beanstalk_application.html">aws_elastic_beanstalk_application</a>
+                        </li>
+
+                        <li<%= sidebar_current("docs-aws-resource-elastic-beanstalk-configuration-template") %>>
+                            <a href="/docs/providers/aws/r/elastic_beanstalk_configuration_template.html">aws_elastic_beanstalk_configuration_template</a>
+                        </li>
+
+                        <li<%= sidebar_current("docs-aws-resource-elastic-beanstalk-environment") %>>
+                            <a href="/docs/providers/aws/r/elastic_beanstalk_environment.html">aws_elastic_beanstalk_environment</a>
+                        </li>
+                    </ul>
+                </li>
+
                 <li<%= sidebar_current(/^docs-aws-resource-elasticsearch/) %>>
                     <a href="#">ElasticSearch Resources</a>
                     <ul class="nav nav-visible">