diff --git a/src/gui/views/gcal-week-view.c b/src/gui/views/gcal-week-view.c
index f6fad2d9..16ac8579 100644
--- a/src/gui/views/gcal-week-view.c
+++ b/src/gui/views/gcal-week-view.c
@@ -241,35 +241,35 @@ on_event_activated (GcalWeekView *self,
 }
 
 static void
-on_motion_controller_enter_cb (GcalWeekView             *self,
+on_motion_controller_enter_cb (GtkEventControllerMotion *controller,
                                gdouble                   x,
                                gdouble                   y,
-                               GtkEventControllerMotion *controller)
+                               GcalWeekView             *self)
 {
   self->pointer_position_valid = TRUE;
   self->pointer_position_y = y;
 }
 
 static void
-on_motion_controller_motion_cb (GcalWeekView             *self,
-                               gdouble                   x,
-                               gdouble                   y,
-                               GtkEventControllerMotion *controller)
+on_motion_controller_motion_cb (GtkEventControllerMotion *controller,
+                                gdouble                   x,
+                                gdouble                   y,
+                                GcalWeekView             *self)
 {
   self->pointer_position_valid = TRUE;
   self->pointer_position_y = y;
 }
 
 static void
-on_motion_controller_leave_cb (GcalWeekView             *self,
-                               GtkEventControllerMotion *controller)
+on_motion_controller_leave_cb (GtkEventControllerMotion *controller,
+                               GcalWeekView             *self)
 {
   self->pointer_position_valid = FALSE;
 }
 
 static void
-on_scroll_controller_scroll_begin_cb (GcalWeekView             *self,
-                                      GtkEventControllerScroll *controller)
+on_scroll_controller_scroll_begin_cb (GtkEventControllerScroll *controller,
+                                      GcalWeekView             *self)
 {
   gdouble view_center_y;
 
@@ -284,10 +284,10 @@ on_scroll_controller_scroll_begin_cb (GcalWeekView             *self,
 }
 
 static gboolean
-on_scroll_controller_scroll_cb (GcalWeekView             *self,
+on_scroll_controller_scroll_cb (GtkEventControllerScroll *controller,
                                 gdouble                   dx,
                                 gdouble                   dy,
-                                GtkEventControllerScroll *controller)
+                                GcalWeekView             *self)
 {
   gdouble scale, view_center_y;
 
@@ -315,9 +315,9 @@ on_scroll_controller_scroll_end_cb (GtkEventControllerScroll *controller,
 }
 
 static void
-on_zoom_gesture_scale_changed_cb (GcalWeekView   *self,
+on_zoom_gesture_scale_changed_cb (GtkGestureZoom *gesture,
                                   gdouble         scale,
-                                  GtkGestureZoom *gesture)
+                                  GcalWeekView   *self)
 {
   gdouble view_center_x, view_center_y;
 
@@ -327,9 +327,9 @@ on_zoom_gesture_scale_changed_cb (GcalWeekView   *self,
 }
 
 static void
-on_zoom_gesture_begin_cb (GcalWeekView     *self,
+on_zoom_gesture_begin_cb (GtkGesture       *gesture,
                           GdkEventSequence *sequence,
-                          GtkGesture       *gesture)
+                          GcalWeekView     *self)
 {
   gdouble view_center_x, view_center_y;
 
diff --git a/src/gui/views/gcal-week-view.ui b/src/gui/views/gcal-week-view.ui
index bf8147cb..b535ec96 100644
--- a/src/gui/views/gcal-week-view.ui
+++ b/src/gui/views/gcal-week-view.ui
@@ -18,8 +18,8 @@
         <!-- Zoom Gesture -->
         <child>
           <object class="GtkGestureZoom">
-            <signal name="scale-changed" handler="on_zoom_gesture_scale_changed_cb" object="GcalWeekView" swapped="yes" />
-            <signal name="begin" handler="on_zoom_gesture_begin_cb" object="GcalWeekView" swapped="yes" />
+            <signal name="scale-changed" handler="on_zoom_gesture_scale_changed_cb" object="GcalWeekView" swapped="no" />
+            <signal name="begin" handler="on_zoom_gesture_begin_cb" object="GcalWeekView" swapped="no" />
             <signal name="end" handler="on_zoom_gesture_end_cb" object="GcalWeekView" swapped="no" />
           </object>
         </child>
@@ -29,8 +29,8 @@
           <object class="GtkEventControllerScroll">
             <property name="propagation-phase">capture</property>
             <property name="flags">vertical|kinetic</property>
-            <signal name="scroll-begin" handler="on_scroll_controller_scroll_begin_cb" object="GcalWeekView" swapped="yes" />
-            <signal name="scroll" handler="on_scroll_controller_scroll_cb" object="GcalWeekView" swapped="yes" />
+            <signal name="scroll-begin" handler="on_scroll_controller_scroll_begin_cb" object="GcalWeekView" swapped="no" />
+            <signal name="scroll" handler="on_scroll_controller_scroll_cb" object="GcalWeekView" swapped="no" />
             <signal name="scroll-end" handler="on_scroll_controller_scroll_end_cb" object="GcalWeekView" swapped="no" />
           </object>
         </child>
@@ -39,9 +39,9 @@
         <child>
           <object class="GtkEventControllerMotion">
             <property name="propagation-phase">capture</property>
-            <signal name="enter" handler="on_motion_controller_enter_cb" object="GcalWeekView" swapped="yes" />
-            <signal name="motion" handler="on_motion_controller_motion_cb" object="GcalWeekView" swapped="yes" />
-            <signal name="leave" handler="on_motion_controller_leave_cb" object="GcalWeekView" swapped="yes" />
+            <signal name="enter" handler="on_motion_controller_enter_cb" object="GcalWeekView" swapped="no" />
+            <signal name="motion" handler="on_motion_controller_motion_cb" object="GcalWeekView" swapped="no" />
+            <signal name="leave" handler="on_motion_controller_leave_cb" object="GcalWeekView" swapped="no" />
           </object>
         </child>