diff --git a/src/applets/tasks.c b/src/applets/tasks.c
index d6b46ff..377d6e6 100644
--- a/src/applets/tasks.c
+++ b/src/applets/tasks.c
@@ -112,7 +112,7 @@ static void _tasks_do(Tasks * tasks);
 /* callbacks */
 static gboolean _on_button_press(GtkWidget * widget, GdkEventButton * event,
 		gpointer data);
-static void _on_clicked(GtkWidget * widget, gpointer data);
+static void _on_clicked(gpointer data);
 static GdkFilterReturn _on_filter(GdkXEvent * xevent, GdkEvent * event,
 		gpointer data);
 static gboolean _on_popup(gpointer data);
@@ -171,8 +171,8 @@ static Task * _task_new(Tasks * tasks, Window window, char const * name,
 			G_CALLBACK(_on_button_press), task);
 	g_signal_connect_swapped(G_OBJECT(task->widget), "popup-menu",
 			G_CALLBACK(_on_popup), task);
-	g_signal_connect(task->widget, "clicked", G_CALLBACK(_on_clicked),
-			task);
+	g_signal_connect_swapped(task->widget, "clicked",
+			G_CALLBACK(_on_clicked), task);
 	task->image = gtk_image_new();
 	task->delete = FALSE;
 	hbox = gtk_hbox_new(FALSE, 0);
@@ -653,13 +653,13 @@ static gboolean _on_button_press(GtkWidget * widget, GdkEventButton * event,
 /* on_clicked */
 static void _clicked_activate(Task * task);
 
-static void _on_clicked(GtkWidget * widget, gpointer data)
+static void _on_clicked(gpointer data)
 {
 	Task * task = data;
 
 	_clicked_activate(task);
 #ifdef EMBEDDED
-	gtk_box_reorder_child(GTK_BOX(task->tasks->hbox), widget, 0);
+	gtk_box_reorder_child(GTK_BOX(task->tasks->hbox), task->widget, 0);
 #endif
 }