diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index d0800d691e..1473448e54 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -318,3 +318,7 @@
         self-feeding loops expecially with min size hints on scrollers (which
         the change in smart object infra broke too - fixed here).
 
+2012-07-18  Yan Wang
+
+        * Small fix to account for framespace that is used in wayland
+        (0 in x11 so shouldnt affect x11).
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 2a1ee44929..07c0a27a53 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -1498,6 +1498,9 @@ _elm_win_resize_objects_eval(Evas_Object *obj)
         else if ((h > 0) && (h < maxh))
           maxh = h;
      }
+   evas_output_framespace_get(sd->evas, NULL, NULL, &w, &h);
+   minw += w;
+   minh += h;
    if (!xx) maxw = minw;
    else maxw = 32767;
    if (!xy) maxh = minh;