diff --git a/code/media/com_files/js/files.app.js b/code/media/com_files/js/files.app.js
index <HASH>..<HASH> 100644
--- a/code/media/com_files/js/files.app.js
+++ b/code/media/com_files/js/files.app.js
@@ -68,10 +68,8 @@ Files.App = new Class({
 		    this.spinner = new Koowa.Spinner(opts);
 		    this.spinner.spin(target);
 		    
-		    var delay;
 		    window.addEvent('resize', function(){
-		        clearTimeout(delay);
-		        delay = this.setDimensions.delay(200, this);
+		        this.setDimensions(true);
 		    }.bind(this));
 		    this.grid.addEvent('onAfterRenew', function(){
 		        this.setDimensions(true);
@@ -478,7 +476,7 @@ Files.App = new Class({
         if(this._cached_grid_width != this.grid.root.element.getSize().x || force) {
             var width = this.grid.root.element.getSize().x,
                 factor = width/(this.grid.options.icon_size.toInt()+40),
-                limit = Math.floor(factor),
+                limit = Math.min(Math.floor(factor), this.grid.nodes.getLength()),
                 resize = width / limit,
                 thumbs = [[]],
                 labels = [[]],
re #<I> IE9 didn't realigne thumbs correctly on resize