diff --git a/src/bin/clouseau_client.c b/src/bin/clouseau_client.c
index d680f5a..c0cc0ed 100644
--- a/src/bin/clouseau_client.c
+++ b/src/bin/clouseau_client.c
@@ -1929,9 +1929,8 @@ _property_list_create(Evas_Object *panes)
    evas_object_show(o);
 }
 
-#ifndef ELM_LIB_QUICKLAUNCH
-EAPI int
-elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
+int
+main(int argc, char **argv)
 {  /* Create Client Window */
    const char *log_dom = "clouseau_client";
    _clouseau_client_log_dom = eina_log_domain_register(log_dom, EINA_COLOR_LIGHTBLUE);
@@ -1950,6 +1949,9 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
 
    gui = calloc(1, sizeof(gui_elements));
 
+   setenv("ELM_CLOUSEAU", "0", 1);
+   elm_init(argc, argv);
+
    gui->win = win = elm_win_util_standard_add("client", CLIENT_NAME);
    elm_win_autodel_set(win, EINA_TRUE);
    _titlebar_string_set(gui, EINA_FALSE);
@@ -2096,5 +2098,3 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
 
    return 0;
 }
-ELM_MAIN()
-#endif
diff --git a/src/lib/clouseau_preload.c b/src/lib/clouseau_preload.c
index 48799f5..278442f 100644
--- a/src/lib/clouseau_preload.c
+++ b/src/lib/clouseau_preload.c
@@ -19,6 +19,8 @@ elm_init(int argc, char **argv)
 {
    int (*_elm_init)(int, char **) = dlsym(RTLD_NEXT, __func__);
 
+   setenv("ELM_CLOUSEAU", "0", 1);
+
    if (!_elm_is_init)
      {
         _my_app_name = argv[0];