diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index e2d9d0f7b..28f5d4181 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -20,7 +20,14 @@ group { name: "e/widgets/border/default/border";
    images.image: "glow_round_corners_small.png" COMP;
    images.image: "knob_round_small_busy.png" COMP;
    parts {
+      part { name: "client_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to_y: "e.swallow.client";
+            rel2.to_y: "e.swallow.client";
+         }
+      }
       part { name: "e.swallow.client"; type: SWALLOW;
+         clip_to: "client_clip";
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel1.to_y: "top";
@@ -836,6 +843,12 @@ group { name: "e/widgets/border/noresize_dialog/border";
 
 group { name: "e/widgets/border/pixel/border";
    parts {
+      part { name: "client_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to_y: "e.swallow.client";
+            rel2.to_y: "e.swallow.client";
+         }
+      }
       part { name: "e.swallow.client"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.offset: 1 1;