diff --git a/experimental/ecdb/trunk/data/themes/default/groups/welcome_page.edc b/experimental/ecdb/trunk/data/themes/default/groups/welcome_page.edc
index b317c112..361d08ea 100644
--- a/experimental/ecdb/trunk/data/themes/default/groups/welcome_page.edc
+++ b/experimental/ecdb/trunk/data/themes/default/groups/welcome_page.edc
@@ -99,8 +99,8 @@ group {
 
 		program {
 			name: "b1_clicked";
-			signal: "mouse,up,1";
 			signal: "mouse,clicked,1";
+			signal: "mouse,up,1";
 			action: SIGNAL_EMIT "clicked" "b1";
 			source: "b1";
 		}
@@ -114,8 +114,8 @@ group {
 
 		program {
 			name: "b2_clicked";
-			signal: "mouse,up,1";
 			signal: "mouse,clicked,1";
+			signal: "mouse,up,1";
 			action: SIGNAL_EMIT "clicked" "b2";
 			source: "b2";
 		}
@@ -129,8 +129,8 @@ group {
 
 		program {
 			name: "b3_clicked";
-			signal: "mouse,up,1";
 			signal: "mouse,clicked,1";
+			signal: "mouse,up,1";
 			action: SIGNAL_EMIT "clicked" "b3";
 			source: "b3";
 		}
@@ -144,8 +144,8 @@ group {
 
 		program {
 			name: "b4_clicked";
-			signal: "mouse,up,1";
 			signal: "mouse,clicked,1";
+			signal: "mouse,up,1";
 			action: SIGNAL_EMIT "clicked" "b4";
 			source: "b4";
 		}
diff --git a/experimental/ecdb/trunk/src/ecdb_gui.c b/experimental/ecdb/trunk/src/ecdb_gui.c
index 6ce82365..96582985 100644
--- a/experimental/ecdb/trunk/src/ecdb_gui.c
+++ b/experimental/ecdb/trunk/src/ecdb_gui.c
@@ -171,7 +171,6 @@ ecdb_create_main_gui(void)
 
 	ecore_evas_callback_delete_request_set(em->main_win_ee, ecdb_shutdown);
 	ecore_evas_callback_destroy_set(em->main_win_ee, ecdb_shutdown);
-	ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, ecdb_shutdown, NULL);
 
 	ecore_evas_callback_mouse_in_set(em->main_win_ee, ecdb_cb_enter);
 	ecore_evas_callback_mouse_out_set(em->main_win_ee, ecdb_cb_leave);
@@ -377,6 +376,12 @@ ecdb_handle_typebuf(Evas_Object *gui)
 				NULL);
 		return;
 	}
+	else if (!ecdb_match_keyword(ext, "exit", 4))
+	{
+		/* This creates an ewl error... */
+		ecore_event_add(ECORE_EVENT_SIGNAL_EXIT, NULL, NULL, NULL);
+		return;
+	}
 	
 	filter = ewl_filelist_filter_get(EWL_FILELIST(fl));
 	if (!filter)