diff --git a/webapp/components/admin_console/admin_console.jsx b/webapp/components/admin_console/admin_console.jsx
index 33868950bc..682dbdeda4 100644
--- a/webapp/components/admin_console/admin_console.jsx
+++ b/webapp/components/admin_console/admin_console.jsx
@@ -43,9 +43,12 @@ export default class AdminConsole extends React.Component {
 
     render() {
         const config = this.state.config;
+        if (!config) {
+            return <div/>;
+        }
         if (config && Object.keys(config).length === 0 && config.constructor === 'Object') {
             return (
-                <div>
+                <div className='admin-console__wrapper'>
                     <ErrorBar/>
                     <div className='admin-console'/>
                 </div>
@@ -56,9 +59,8 @@ export default class AdminConsole extends React.Component {
         const children = React.cloneElement(this.props.children, {
             config: this.state.config
         });
-
         return (
-            <div>
+            <div className='admin-console__wrapper'>
                 <ErrorBar/>
                 <div className='admin-console'>
                     <AdminSidebar/>
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index 06db93ec51..86170ffce9 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -1,5 +1,10 @@
 @charset 'UTF-8';
 
+.admin-console__wrapper {
+    height: 100%;
+    overflow: auto;
+}
+
 .admin-console {
     color: #333;
     height: 100%;