diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index 805f35035..da99687d7 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -568,7 +568,7 @@ _e_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resource *reso
 
    if (ec && (!ec->internal))
      e_pixmap_ref(ec->pixmap);
-   if ((!ec) && (!ec->internal) && (!(ec = e_client_new(NULL, ep, 0, 0))))
+   else if ((!ec) && (!(ec = e_client_new(NULL, ep, 0, 0))))
      {
         wl_resource_post_error(surface_resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -1143,7 +1143,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
 
    if (ec && (!ec->internal))
      e_pixmap_ref(ec->pixmap);
-   if ((!ec) && (!ec->internal) && (!(ec = e_client_new(NULL, ep, 0, 0))))
+   else if ((!ec) && (!(ec = e_client_new(NULL, ep, 0, 0))))
      {
         wl_resource_post_error(surface_resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -1242,7 +1242,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
 
    if (ec && (!ec->internal))
      e_pixmap_ref(ec->pixmap);
-   if ((!ec) && (!ec->internal) && (!(ec = e_client_new(NULL, ep, 0, 0))))
+   else if ((!ec) && (!(ec = e_client_new(NULL, ep, 0, 0))))
      {
         wl_resource_post_error(surface_resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,