diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index b1d45eebd8..45b6b733ba 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -1193,7 +1193,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
             );
             return;
         }
-        var buffer = this.buffer || 1;
+        var buffer = this.buffer + 1;
         var scale = this.getResolutionScale();
         while(true) {
             var tlViewPort = {
diff --git a/tests/Layer/Grid.html b/tests/Layer/Grid.html
index 50464f3cd8..956b12f812 100644
--- a/tests/Layer/Grid.html
+++ b/tests/Layer/Grid.html
@@ -239,6 +239,23 @@
         t.eq( zoom, 2, "getZoomForExtent() returns correct value");
     }   
     
+    function test_moveGriddedTiles(t) {
+        t.plan(1);
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.WMS(name, url, params, {buffer: 2});
+        map.addLayer(layer);
+        map.setCenter([0, 0], 5);
+        var count = 0;
+        layer.shiftColumn = function(prepend) {
+            ++count;
+            OpenLayers.Layer.WMS.prototype.shiftColumn.apply(this, arguments);
+        }
+        map.moveTo([15, 0]);
+        t.delay_call(.5, function() {
+            t.eq(count, 1, "column shifted once");
+        });
+    }
+    
     function test_Layer_Grid_moveTo(t) {
 
         t.plan(17);