diff --git a/ChangeLog b/ChangeLog
index 075316882..5bfcf9ec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
+2013-01-15 Mike Blumenkrantz
+
+        * prevent windows dragged from one screen to another from being larger than the destination screen
+
 2013-01-14 Brian Miculcy
+
         * Backlight, screenlock and screensaver don't check for fullscreen windows - we have presentation mode for that.
 
 2013-01-14 Mike Blumenkrantz
diff --git a/NEWS b/NEWS
index a3124c4a9..d40540a10 100644
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,7 @@ Improvements:
     * added focus-out color class and functionality to default theme
     * added fallback timer for system actions
     * compositor now applies focus/urgency state to windows on first show
+    * prevent windows dragged from one screen to another from being larger than the destination screen
 
 Fixes:
     * Backlight, screenlock and screensaver don't check for fullscreen windows - we have presentation mode for that.
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index a4f483fcd..7d95fe249 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -937,6 +937,9 @@ e_border_zone_set(E_Border *bd,
       ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_ZONE_GEOMETRY, zgeom, 4);
    }
    e_remember_update(bd);
+   e_border_res_change_geometry_save(bd);
+   e_border_res_change_geometry_restore(bd);
+   bd->pre_res_change.valid = 0;
 }
 
 EAPI void