diff --git a/common/changes/office-ui-fabric-react/jolore-contentBoxFix_2018-06-05-21-50.json b/common/changes/office-ui-fabric-react/jolore-contentBoxFix_2018-06-05-21-50.json
new file mode 100644
index 00000000000000..02f18a9b253408
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/jolore-contentBoxFix_2018-06-05-21-50.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "adding css fix to remove unnecessary scroll bars on calendar and datepicker components",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "jolore@microsoft.com"
+}
diff --git a/packages/office-ui-fabric-react/src/components/Calendar/Calendar.scss b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.scss
index c9e13357ef790b..e6a9c20c6dab28 100644
--- a/packages/office-ui-fabric-react/src/components/Calendar/Calendar.scss
+++ b/packages/office-ui-fabric-react/src/components/Calendar/Calendar.scss
@@ -57,6 +57,7 @@ $Calendar-dayPicker-margin: 10px;
   min-height: 212px;
   padding: 12px;
   display: flex;
+  box-sizing: content-box;
 }
 
 // Wrapper containing the calendar view to pick a specific date.