diff --git a/src/gui/event-editor/gcal-event-editor-dialog.ui b/src/gui/event-editor/gcal-event-editor-dialog.ui
index f0cc2c97..b5505fa3 100644
--- a/src/gui/event-editor/gcal-event-editor-dialog.ui
+++ b/src/gui/event-editor/gcal-event-editor-dialog.ui
@@ -6,6 +6,17 @@
     <property name="default-height">1000</property>
     <property name="destroy-with-parent">True</property>
     <property name="hide-on-close">True</property>
+    <child>
+      <object class="GtkShortcutController">
+        <child>
+          <object class="GtkShortcut">
+            <property name="trigger">Escape</property>
+            <property name="action">action(window.close)</property>
+          </object>
+        </child>
+      </object>
+    </child>
+
     <child>
       <object class="AdwToolbarView">
         <child type="top">
@@ -13,7 +24,8 @@
             <property name="show-title-buttons">False</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
+                <property name="use-underline">True</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <signal name="clicked" handler="on_cancel_button_clicked_cb" object="GcalEventEditorDialog" swapped="no"/>
               </object>
             </child>
@@ -84,7 +96,8 @@
             </child>
             <child type="end">
               <object class="GtkButton" id="done_button">
-                <property name="label" translatable="yes">Done</property>
+                <property name="use-underline">True</property>
+                <property name="label" translatable="yes">_Done</property>
                 <signal name="clicked" handler="on_done_button_clicked_cb" object="GcalEventEditorDialog" swapped="no"/>
                 <style>
                   <class name="suggested-action"/>