diff --git a/.gitignore b/.gitignore
index b8549d26c..cb605cb8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea/
 .vscode/
 dist/
 node_modules/
diff --git a/terminus-ui/date-range/src/date-range.component.html b/terminus-ui/date-range/src/date-range.component.html
index de4d6230c..4593a6bcf 100644
--- a/terminus-ui/date-range/src/date-range.component.html
+++ b/terminus-ui/date-range/src/date-range.component.html
@@ -13,7 +13,6 @@
     (selected)="startDateSelected($event)"
     (inputBlur)="startBlur($event)"
     #start
-    fxFlex
   ></ts-input>
 
   <span class="c-date-range__seperator">
@@ -34,6 +33,5 @@
     (selected)="endDateSelected($event)"
     (inputBlur)="endBlur($event)"
     #end
-    fxFlex
   ></ts-input>
 </div>
diff --git a/terminus-ui/form-field/src/form-field.component.scss b/terminus-ui/form-field/src/form-field.component.scss
index 7119b9f4d..e0f2e6c59 100644
--- a/terminus-ui/form-field/src/form-field.component.scss
+++ b/terminus-ui/form-field/src/form-field.component.scss
@@ -57,7 +57,8 @@ $subscript-margin-top: .5em / $subscript-font-scale;
 $wrapper-padding-bottom: ($subscript-margin-top + $line-height) * $subscript-font-scale;
 // The amount we offset the label from the input text in the outline appearance.
 $outline-appearance-label-offset: -.25em;
-
+// The width we set for datepicker
+$date-picker-width: 200px;
 
 
 //
@@ -373,6 +374,7 @@ $outline-appearance-label-offset: -.25em;
 
 // Target an input datepicker within a form field
 .ts-input--datepicker {
+  width: $date-picker-width;
   .ts-form-field {
     // Center the datepicker icon vertically
     .ts-form-field__suffix {