diff --git a/modules/system/assets/ui/js/filter.dates.js b/modules/system/assets/ui/js/filter.dates.js
index 3f08feba8..0956366c7 100644
--- a/modules/system/assets/ui/js/filter.dates.js
+++ b/modules/system/assets/ui/js/filter.dates.js
@@ -121,7 +121,7 @@
                                 </div>                                                                                  \
                             </div>                                                                                      \
                             <div class="filter-buttons">                                                                \
-                                <button class="btn btn-block btn-secondary" data-trigger="clear">                         \
+                                <button class="btn btn-block btn-secondary" data-trigger="clear">                       \
                                     {{ reset_button_text }}                                                             \
                                 </button>                                                                               \
                             </div>                                                                                      \
@@ -138,7 +138,7 @@
         return '                                                                                                        \
                 <form>                                                                                                  \
                     <input type="hidden" name="scopeName" value="{{ scopeName }}" />                                    \
-                    <div id="controlFilterPopover" class="control-filter-popover control-filter-date-popover">          \
+                    <div id="controlFilterPopover" class="control-filter-popover control-filter-date-popover --range">  \
                         <div class="filter-search loading-indicator-container size-input-text">                         \
                             <div class="field-datepicker">                                                              \
                                 <div class="input-with-icon right-align">                                               \
@@ -168,7 +168,7 @@
                                 <button class="btn btn-block btn-primary oc-icon-search" data-trigger="filter">         \
                                     {{ filter_button_text }}                                                            \
                                 </button>                                                                               \
-                                <button class="btn btn-block btn-secondary" data-trigger="clear">                         \
+                                <button class="btn btn-block btn-secondary" data-trigger="clear">                       \
                                     {{ reset_button_text }}                                                             \
                                 </button>                                                                               \
                             </div>                                                                                      \
diff --git a/modules/system/assets/ui/less/filter.less b/modules/system/assets/ui/less/filter.less
index 139025878..7ae72c1d6 100644
--- a/modules/system/assets/ui/less/filter.less
+++ b/modules/system/assets/ui/less/filter.less
@@ -219,10 +219,29 @@
     &.control-filter-date-popover {
         min-width: 190px;
 
-        .filter-buttons .btn {
-            border-radius: 0;
-            text-align: center;
+        .filter-buttons {
             margin: 0;
+            padding: 0;
+
+            &:after {
+                content: "";
+                display: block;
+                clear: both;
+            }
+
+            .btn {
+                float: left;
+                width: 100%;
+                margin: 0;
+                border-radius: 0;
+                text-align: center;
+            }
+        }
+
+        &.--range {
+            .filter-buttons .btn {
+                width: 50%;
+            }
         }
     }
 }