diff --git a/src/app/components/components/components.module.ts b/src/app/components/components/components.module.ts
index 61d770f626..caad360e37 100644
--- a/src/app/components/components/components.module.ts
+++ b/src/app/components/components/components.module.ts
@@ -94,6 +94,7 @@ import { DocumentationToolsModule } from '../../documentation-tools';
     MdTabsModule,
     MdTooltipModule,
     MdProgressBarModule,
+    MdAutocompleteModule,
     /** Covalent Modules */
     CovalentCommonModule,
     CovalentLayoutModule,
diff --git a/src/platform/core/steps/step-body/step-body.component.html b/src/platform/core/steps/step-body/step-body.component.html
index e7c7b97f71..77e7306998 100644
--- a/src/platform/core/steps/step-body/step-body.component.html
+++ b/src/platform/core/steps/step-body/step-body.component.html
@@ -1,9 +1,9 @@
 <div layout="row" flex>
   <ng-content></ng-content>
-  <div flex>
+  <div class="td-step-body" flex>
     <div class="td-step-content-wrapper"
          [@tdCollapse]="!active">
-      <div #contentRef [class.td-step-content]="contentRef.children.length || contentRef.textContent.trim()">
+      <div #contentRef cdkScrollable [class.td-step-content]="contentRef.children.length || contentRef.textContent.trim()">
         <ng-content select="[td-step-body-content]"></ng-content>
       </div>
       <div #actionsRef layout="row" [class.td-step-actions]="actionsRef.children.length || actionsRef.textContent.trim()">
diff --git a/src/platform/core/steps/step-body/step-body.component.scss b/src/platform/core/steps/step-body/step-body.component.scss
index e69de29bb2..8a8f7dcb3a 100644
--- a/src/platform/core/steps/step-body/step-body.component.scss
+++ b/src/platform/core/steps/step-body/step-body.component.scss
@@ -0,0 +1,6 @@
+.td-step-body {
+  overflow-x: hidden;
+  .td-step-content {
+    overflow-x: auto; 
+  }
+}
\ No newline at end of file
diff --git a/src/platform/core/steps/steps.module.ts b/src/platform/core/steps/steps.module.ts
index b08d118908..ab03a8b95d 100644
--- a/src/platform/core/steps/steps.module.ts
+++ b/src/platform/core/steps/steps.module.ts
@@ -2,7 +2,7 @@ import { Type } from '@angular/core';
 import { NgModule, ModuleWithProviders } from '@angular/core';
 
 import { CommonModule } from '@angular/common';
-import { MdIconModule, MdRippleModule, PortalModule } from '@angular/material';
+import { MdIconModule, MdRippleModule, PortalModule, ScrollDispatchModule } from '@angular/material';
 
 import { CovalentCommonModule } from '../common/common.module';
 
@@ -32,6 +32,7 @@ export { TdStepsComponent, IStepChangeEvent, StepMode } from './steps.component'
     MdIconModule,
     MdRippleModule,
     PortalModule,
+    ScrollDispatchModule,
     CovalentCommonModule,
   ],
   declarations: [