diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index 7a418f324f..6e301c930f 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -635,7 +635,8 @@ wayland_im_context_focus_in(Ecore_IMF_Context *ctx)
 
    imcontext->input = input;
 
-   if (imcontext->text_input)
+   if ((imcontext->text_input) && 
+       (ecore_imf_context_input_panel_enabled_get(ctx)))
      {
         wl_text_input_show_input_panel(imcontext->text_input);
         wl_text_input_activate(imcontext->text_input, seat,
@@ -759,7 +760,8 @@ wayland_im_context_show(Ecore_IMF_Context *ctx)
 
    EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_show");
 
-   if (imcontext->text_input)
+   if ((imcontext->text_input) && 
+       (ecore_imf_context_input_panel_enabled_get(ctx)))
      wl_text_input_show_input_panel(imcontext->text_input);
 }
 
@@ -770,7 +772,8 @@ wayland_im_context_hide(Ecore_IMF_Context *ctx)
 
    EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_hide");
 
-   if (imcontext->text_input)
+   if ((imcontext->text_input) && 
+       (ecore_imf_context_input_panel_enabled_get(ctx)))
      wl_text_input_hide_input_panel(imcontext->text_input);
 }