diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 3ccb1682d6..5d3733acab 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -370,3 +370,7 @@
 2012-08-06  Cedric Bail
 
 	* Make Elm_Slider update itself asynchronously.
+
+2012-08-09  Cedric Bail
+
+	* Reset main loop after fork in quicklaunch.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index df9976cabe..0248d51490 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -29,6 +29,7 @@ Fixes:
    * Fileselector : honor the folder_only option when using EIO
    * Segment Selector : do not abuse user object item data.
    * Image: fixed elm_image_orient_set/get.
+   * QuickLaunch: reset main loop after fork.
 
 Improvements:
 
diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c
index 3a2e16a9a4..c9f41549ae 100644
--- a/legacy/elementary/src/lib/elm_main.c
+++ b/legacy/elementary/src/lib/elm_main.c
@@ -716,6 +716,8 @@ elm_quicklaunch_fork(int    argc,
      }
    if (postfork_func) postfork_func(postfork_data);
 
+   ecore_fork_reset();
+
    if (quicklaunch_on)
      {
         if (_elm_appname) free(_elm_appname);