diff --git a/src/gui/event-editor/gcal-event-editor-dialog.c b/src/gui/event-editor/gcal-event-editor-dialog.c
index 6d03d6d6..4e30a494 100644
--- a/src/gui/event-editor/gcal-event-editor-dialog.c
+++ b/src/gui/event-editor/gcal-event-editor-dialog.c
@@ -455,13 +455,6 @@ on_ask_recurrence_response_save_cb (GcalEvent             *event,
   GCAL_EXIT;
 }
 
-static void
-on_done_button_clicked_cb (GtkButton             *button,
-                           GcalEventEditorDialog *self)
-{
-  save_event_and_close_dialog (self);
-}
-
 
 /*
  * Gobject overrides
@@ -616,7 +609,6 @@ gcal_event_editor_dialog_class_init (GcalEventEditorDialogClass *klass)
   /* callbacks */
   gtk_widget_class_bind_template_callback (widget_class, on_cancel_button_clicked_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_delete_row_activated_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_done_button_clicked_cb);
 }
 
 static void
diff --git a/src/gui/event-editor/gcal-event-editor-dialog.ui b/src/gui/event-editor/gcal-event-editor-dialog.ui
index 6e3d057a..eecc7291 100644
--- a/src/gui/event-editor/gcal-event-editor-dialog.ui
+++ b/src/gui/event-editor/gcal-event-editor-dialog.ui
@@ -29,7 +29,7 @@
               <object class="GtkButton" id="done_button">
                 <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"/>
+                <property name="action-name">event-editor.save</property>
                 <style>
                   <class name="suggested-action"/>
                 </style>