diff --git a/pages/get-calendar-event/mzta-get-calendar-event.js b/pages/get-calendar-event/mzta-get-calendar-event.js
index 2b956440..584fb244 100644
--- a/pages/get-calendar-event/mzta-get-calendar-event.js
+++ b/pages/get-calendar-event/mzta-get-calendar-event.js
@@ -78,6 +78,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     let get_calendar_event_save_btn = document.getElementById('btn_save_prompt');
     let get_calendar_event_reset_btn = document.getElementById('btn_reset_prompt');
     let get_calendar_event_use_specific_integration = document.getElementById('get_calendar_event_use_specific_integration');
+    let get_calendar_event_no_selection = document.getElementById('calendar_no_selection');
 
     get_calendar_event_textarea.addEventListener('input', (event) => {
         get_calendar_event_reset_btn.disabled = (event.target.value === browser.i18n.getMessage('prompt_get_calendar_event_full_text'));
@@ -95,6 +96,12 @@ document.addEventListener('DOMContentLoaded', async () => {
         }
     });
 
+    get_calendar_event_no_selection.addEventListener('change', async (event) => {
+        specialPrompts.find(prompt => prompt.id === 'prompt_get_calendar_event').need_selected = event.target.checked ? '0' : '1';
+        await setSpecialPrompts(specialPrompts);
+        browser.runtime.sendMessage({command: "reload_menus"});
+    });
+
     get_calendar_event_reset_btn.addEventListener('click', () => {
         get_calendar_event_textarea.value = browser.i18n.getMessage('prompt_get_calendar_event_full_text');
         get_calendar_event_reset_btn.disabled = true;
@@ -102,9 +109,9 @@ document.addEventListener('DOMContentLoaded', async () => {
         get_calendar_event_textarea.dispatchEvent(event);
     });
 
-    get_calendar_event_save_btn.addEventListener('click', () => {
+    get_calendar_event_save_btn.addEventListener('click', async () => {
         specialPrompts.find(prompt => prompt.id === 'prompt_get_calendar_event').text = get_calendar_event_textarea.value;
-        setSpecialPrompts(specialPrompts);
+        await setSpecialPrompts(specialPrompts);
         get_calendar_event_save_btn.disabled = true;
         document.getElementById('get_calendar_event_prompt_unsaved').classList.add('hidden');
         browser.runtime.sendMessage({command: "reload_menus"});