fix N_SE-50147

Change-Id: I2af612321c6ded442ec74e20bd4890f3073ef23f

diff --git a/ism/extras/efl_setting/isf_setting_efl.cpp b/ism/extras/efl_setting/isf_setting_efl.cpp
index f5f3120..eee8e57 100755 (executable)
--- a/ism/extras/efl_setting/isf_setting_efl.cpp
+++ b/ism/extras/efl_setting/isf_setting_efl.cpp
@@ -1349,8 +1349,12 @@ static void hw_connection_change_cb (ug_data *ugd)
     }
     else if (ugd->key_end_cb == ise_option_view_set_cb) {
         // ISE or IMEngine option view
-        elm_naviframe_item_pop (ugd->naviframe);
+        Elm_Object_Item *top_it = elm_naviframe_top_item_get (ugd->naviframe);
+        if (top_it != nf_main_it) {
+            elm_naviframe_item_pop_to (nf_main_it);
+        }
     }
+    ugd->key_end_cb = back_cb;
 }
 
 static Eina_Bool x_window_property_change_cb (void *data, int ev_type, void *ev)