diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index cc10e8b..d92e151 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -408,6 +408,7 @@ class Search {
     };
 
     searchDate = '';
+    prevManualDate = '';
 
     //settings
     showCounts = true;
@@ -977,6 +978,10 @@ class Search {
     updateSearchDate(toLocal) {
         if (toLocal) {
             let local = this.search.date || '';
+
+            if (this.isManualDate(local) || !local)
+                this.prevManualDate = local;
+
             if (this.isManualDate(local))
                 local = 'manual';
 
@@ -1004,8 +1009,9 @@ class Search {
     dateSelectItemClick(itemValue) {
         if (itemValue == 'manual') {
             if (!this.isManualDate(this.search.date)) {
-                this.search.date = '';
-                this.searchDate = '';
+                this.search.date = this.prevManualDate;
+                if (!this.search.date)
+                    this.searchDate = '';
             }
             this.selectDateDialogVisible = true
         }
diff --git a/client/components/Search/SelectDateDialog/SelectDateDialog.vue b/client/components/Search/SelectDateDialog/SelectDateDialog.vue
index 8db9084..c4d1746 100644
--- a/client/components/Search/SelectDateDialog/SelectDateDialog.vue
+++ b/client/components/Search/SelectDateDialog/SelectDateDialog.vue
@@ -96,7 +96,14 @@ class SelectDateDialog {
         this.to = this.splitDate.to;
     }
 
+    isManualDate(date) {
+        return date && utils.isDigit(date[0]) && utils.isDigit(date[1]);
+    }
+
     get splitDate() {
+        if (!this.isManualDate(this.date))
+            return {from: '', to: ''};
+
         const [from = '', to = ''] = (this.date || '').split(',');
         return {from, to};
     }