diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index bb4020d52..60279f45f 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -1165,6 +1165,9 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
      ec->border.changed = ec->changes.border = !ec->borderless;
    ec->netwm.type = E_WINDOW_TYPE_NORMAL;
    ec->comp_data->set_win_type = EINA_TRUE;
+
+   if (ec->internal_elm_win && evas_object_visible_get(ec->internal_elm_win))
+     _e_xdg_shell_surface_map(surface_resource);
 }
 
 static void
@@ -1272,7 +1275,8 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
         cdata->popup.x = x;
         cdata->popup.y = y;
      }
-
+   if (ec->internal_elm_win && evas_object_visible_get(ec->internal_elm_win))
+     _e_xdg_shell_surface_map(surface_resource);
 }
 
 static void