diff --git a/src/components/Dropdown/Calendar/Calendar.jsx b/src/components/Dropdown/Calendar/Calendar.jsx
index 6ed2b907..1128bbaf 100644
--- a/src/components/Dropdown/Calendar/Calendar.jsx
+++ b/src/components/Dropdown/Calendar/Calendar.jsx
@@ -48,15 +48,7 @@ function Calendar({ children, allCalendarsData, setPageNumber }) {
       dispatch(setSelectedCalendar(String(key)));
       Cookies.set('calendarId', key);
       setPageNumber(1);
-      sessionStorage.removeItem('page');
-      sessionStorage.removeItem('query');
-      sessionStorage.removeItem('order');
-      sessionStorage.removeItem('sortBy');
-      sessionStorage.removeItem('users');
-      sessionStorage.removeItem('publication');
-      sessionStorage.removeItem('startDateRange');
-      sessionStorage.removeItem('endDateRange');
-      sessionStorage.removeItem('organizers');
+      sessionStorage.clear();
       setOpen(false);
       console.log(window.location.origin);
       const origin = window.location.origin;
diff --git a/src/components/TimePicker/TimePicker.jsx b/src/components/TimePicker/TimePicker.jsx
index a579ba34..93b4284a 100644
--- a/src/components/TimePicker/TimePicker.jsx
+++ b/src/components/TimePicker/TimePicker.jsx
@@ -10,6 +10,7 @@ function TimePickerStyled(props) {
       showNow={false}
       size="large"
       suffixIcon={false}
+      autoFocus={true}
       minuteStep={15}
       getPopupContainer={(trigger) => trigger.parentNode}
       {...props}