diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 30d66c2ca..6c204f443 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4347,12 +4347,13 @@ e_client_border_set(E_Client *ec, const char *name)
    if (ec->border.changed)
      CRI("CALLING WHEN border.changed SET!");
 
-   if (!e_util_strcmp(ec->border.name, name)) return EINA_TRUE;
-   if (ec->mwm.borderless && name && strcmp(name, "borderless"))
+   if (eina_streq(ec->border.name, name)) return EINA_TRUE;
+   if (ec->mwm.borderless && (!eina_streq(name, "borderless")))
      {
         e_util_dialog_show(_("Client Error!"), _("Something has attempted to set a border when it shouldn't! Report this!"));
         CRI("border change attempted for MWM borderless client!");
      }
+   if ((!ec->border.name) && eina_streq(name, "borderless")) return EINA_TRUE;
    pborder = ec->border.name;
    ec->border.name = eina_stringshare_add(name);
    if (e_comp_object_frame_theme_set(ec->frame, name))
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 9a51edfc9..7a28aa6be 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3315,6 +3315,7 @@ e_comp_object_frame_theme_set(Evas_Object *obj, const char *name)
     return edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->frame_object ?: cw->obj);
    if (!e_util_strcmp(name, "COMP_RESHADOW"))
      return _e_comp_object_shadow_setup(cw);
+   if (eina_streq(name, "borderless") && (!cw->frame_object)) return EINA_TRUE;
    pbg = cw->frame_object;
    theme = eina_stringshare_add(name);