diff --git a/src/bin/elementary/test_ctxpopup.c b/src/bin/elementary/test_ctxpopup.c
index 27e5376a2a..fbc9042c53 100644
--- a/src/bin/elementary/test_ctxpopup.c
+++ b/src/bin/elementary/test_ctxpopup.c
@@ -50,6 +50,7 @@ _ctxpopup_item_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
 {
    printf("ctxpopup item selected: %s\n",
    elm_object_item_text_get(event_info));
+   elm_ctxpopup_dismiss(obj);
 }
 
 static Elm_Object_Item *
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 3ef52c5ddf..2cfc15c454 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -938,7 +938,8 @@ _bg_clicked_cb(void *data,
 {
    ELM_CTXPOPUP_DATA_GET(data, sd);
 
-   _hide_signals_emit(data, sd->dir);
+   if (sd->auto_hide)
+     _hide_signals_emit(data, sd->dir);
 }
 
 static void