diff --git a/src/Grid/EventButton.vala b/src/Grid/EventButton.vala
index 98ad7119e..52a5a5cd6 100644
--- a/src/Grid/EventButton.vala
+++ b/src/Grid/EventButton.vala
@@ -9,6 +9,9 @@
 public class Maya.View.EventButton : Gtk.Bin {
     public ECal.Component comp { get; construct set; }
 
+    private const Gtk.TargetEntry DND = {"binary/calendar", 0, 0};
+    private const Gtk.TargetEntry DND2 = {"text/uri-list", 0, 1};
+
     private Gtk.Revealer revealer;
     private Gtk.Label label;
     private Gtk.StyleContext grid_style_context;
@@ -84,24 +87,9 @@ public class Maya.View.EventButton : Gtk.Bin {
             long_press_gesture.reset ();
         });
 
-        Gtk.TargetEntry dnd = {"binary/calendar", 0, 0};
-        Gtk.TargetEntry dnd2 = {"text/uri-list", 0, 0};
-        Gtk.drag_source_set (event_box, Gdk.ModifierType.BUTTON1_MASK, {dnd, dnd2}, Gdk.DragAction.MOVE);
-
-        event_box.drag_data_get.connect ( (ctx, sel, info, time) => {
-            Calendar.EventStore.get_default ().drag_component = comp;
-            unowned ICal.Component icalcomp = comp.get_icalcomponent ();
-            var ical_str = icalcomp.as_ical_string ();
-            sel.set_text (ical_str, ical_str.length);
-            try {
-                var path = GLib.Path.build_filename (GLib.Environment.get_tmp_dir (), icalcomp.get_summary () + ".ics");
-                var file = File.new_for_path (path);
-                if (file.replace_contents (ical_str.data, null, false, FileCreateFlags.PRIVATE, null))
-                    sel.set_uris ({file.get_uri ()});
-            } catch (Error e) {
-                critical (e.message);
-            }
-        });
+        Gtk.drag_source_set (event_box, Gdk.ModifierType.BUTTON1_MASK, {DND, DND2}, Gdk.DragAction.MOVE);
+
+        event_box.drag_data_get.connect (on_drag_data_get);
 
         E.Source source = comp.get_data ("source");
 
@@ -114,6 +102,29 @@ public class Maya.View.EventButton : Gtk.Bin {
         });
     }
 
+    private void on_drag_data_get (Gtk.Widget widget, Gdk.DragContext context, Gtk.SelectionData selection_data, uint target_type, uint time) {
+        Calendar.EventStore.get_default ().drag_component = comp;
+
+        unowned var icalcomp = comp.get_icalcomponent ();
+        var ical_str = icalcomp.as_ical_string ();
+        switch (target_type) {
+            case 0:
+                selection_data.set_text (ical_str, ical_str.length);
+                break;
+            case 1:
+                try {
+                    var path = GLib.Path.build_filename (GLib.Environment.get_tmp_dir (), icalcomp.get_summary () + ".ics");
+                    var file = File.new_for_path (path);
+                    if (file.replace_contents (ical_str.data, null, false, FileCreateFlags.PRIVATE, null)) {
+                        selection_data.set_uris ({file.get_uri ()});
+                    }
+                } catch (Error e) {
+                    critical (e.message);
+                }
+                break;
+        };
+    }
+
     public string get_uid () {
         return comp.get_id ().get_uid ();
     }