diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 43255e0898..b4dbbe6fe6 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -2647,7 +2647,10 @@ e_border_unshade(E_Border *bd,
         bd->shaded = 0;
         bd->changes.shaded = 1;
         bd->changed = 1;
-        edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
+        if (!e_config->border_frame)
+          edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
+        else
+          edje_object_signal_emit(bd->bg_object, "e,state,unshaded,noframe", "e");
         e_border_frame_recalc(bd);
         ev = E_NEW(E_Event_Border_Resize, 1);
         ev->border = bd;
@@ -9592,9 +9595,16 @@ _e_border_shade_animator(void *data)
         bd->shade.anim = NULL;
 
         if (bd->shaded)
+        {
           edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
+        }
         else
-          edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
+        {
+          if (!e_config->border_frame)
+            edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
+          else
+            edje_object_signal_emit(bd->bg_object, "e,state,unshaded,noframe", "e");
+        }
         edje_object_message_signal_process(bd->bg_object);
         e_border_frame_recalc(bd);