diff --git a/src/components/Layout.js b/src/components/Layout.js
index c637ce2194..1d1a341f0a 100644
--- a/src/components/Layout.js
+++ b/src/components/Layout.js
@@ -6,15 +6,14 @@ import Footer from './Footer'
 import SEO from './Seo'
 
 const Layout = ( { children, title, section, className, noSearch } ) => (
-  // Temporarily added (need to find a way around this)
-  <body className={className}>
+  <div className={className}>
     <SEO title={title} />
     <Header section={section} noSearch={noSearch} />
 
     {children}
 
     <Footer />
-  </body>
+  </div>
 )
 
 Layout.propTypes = {
diff --git a/src/css/index.less b/src/css/index.less
index d79da38005..0d436bd63d 100644
--- a/src/css/index.less
+++ b/src/css/index.less
@@ -1,7 +1,7 @@
 @import "variables.less";
 
 // Index page uses a fixed header with an overlay
-body.index {
+.index {
   background: #f5f6f8;
   @media screen and (min-width: 1020px) {
     margin-top: 50px;
