2 files changed, 7 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/CreationDateFacet.js b/server/sonar-web/src/main/js/apps/issues/sidebar/CreationDateFacet.js
index 721c9c75e88..78edc628f71 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/CreationDateFacet.js
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/CreationDateFacet.js
@@ -106,7 +106,7 @@ export default class CreationDateFacet extends React.PureComponent {
       createdAt: undefined,
       createdInLast: undefined,
       sinceLeakPeriod: undefined,
-      [property]: toShortNotSoISOString(parseDate(value))
+      [property]: value ? toShortNotSoISOString(parseDate(value)) : undefined
     });
   };
 
@@ -199,12 +199,14 @@ export default class CreationDateFacet extends React.PureComponent {
       <div className="search-navigator-date-facet-selection">
         <DateInput
           className="search-navigator-date-facet-selection-dropdown-left"
+          inputClassName="search-navigator-date-facet-selection-input"
           onChange={this.handlePeriodChangeAfter}
           placeholder={translate('from')}
           value={createdAfter ? toShortNotSoISOString(createdAfter) : undefined}
         />
         <DateInput
           className="search-navigator-date-facet-selection-dropdown-right"
+          inputClassName="search-navigator-date-facet-selection-input"
           onChange={this.handlePeriodChangeBefore}
           placeholder={translate('to')}
           value={createdBefore ? toShortNotSoISOString(createdBefore) : undefined}
diff --git a/server/sonar-web/src/main/less/components/search-navigator.less b/server/sonar-web/src/main/less/components/search-navigator.less
index e3a5bbd9d06..268629f8e3c 100644
--- a/server/sonar-web/src/main/less/components/search-navigator.less
+++ b/server/sonar-web/src/main/less/components/search-navigator.less
@@ -516,6 +516,10 @@
   font-size: @smallFontSize;
 }
 
+.search-navigator-date-facet-selection-input {
+  width: 115px !important;
+}
+
 .search-navigator-date-facet-selection-dropdown-left {
   float: left;
   .link-no-underline;