diff --git a/src/components/calendar/Calendar.css b/src/components/calendar/Calendar.css
index bc9427b3d9..c0a421341f 100644
--- a/src/components/calendar/Calendar.css
+++ b/src/components/calendar/Calendar.css
@@ -64,7 +64,7 @@
 }
 
 /* Multiple Month DatePicker */
-.p-datepicker-groups {
+.p-datepicker-multiple-month .p-datepicker-group-container {
     display: flex;
 }
 
diff --git a/src/components/calendar/Calendar.js b/src/components/calendar/Calendar.js
index 9cf24f946a..6afaede74a 100644
--- a/src/components/calendar/Calendar.js
+++ b/src/components/calendar/Calendar.js
@@ -2594,15 +2594,11 @@ export class Calendar extends Component {
             return this.renderMonth(monthMetaData, index);
         });
 
-        if (this.props.numberOfMonths > 1) {
-            return (
-                <div className="p-datepicker-groups">
-                    {groups}
-                </div>
-            )
-        }
-
-        return groups;
+        return (
+            <div className="p-datepicker-group-container">
+                {groups}
+            </div>
+        )
     }
 
     renderDateView() {