diff --git a/files/renderer.php b/files/renderer.php
index 2f5f5d4..41fed23 100644
--- a/files/renderer.php
+++ b/files/renderer.php
@@ -107,7 +107,7 @@ class core_files_renderer extends plugin_renderer_base {
         $module = array(
             'name'=>'form_filemanager',
             'fullpath'=>'/lib/form/filemanager.js',
-            'requires' => array('core_filepicker', 'base', 'io-base', 'node', 'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin'),
+            'requires' => array('core_filepicker', 'base', 'io-base', 'node', 'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin', 'resize'),
             'strings' => array(
                 array('error', 'moodle'), array('info', 'moodle'), array('confirmdeletefile', 'repository'),
                 array('draftareanofiles', 'repository'), array('entername', 'repository'), array('enternewname', 'repository'),
diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index 3b2bd3e..03bcd30 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -122,6 +122,27 @@ M.form_filemanager.init = function(Y, options) {
             this.filemanager.all('.fp-vb-icons,.fp-vb-tree,.fp-vb-details').removeClass('checked')
             this.filemanager.all('.fp-vb-icons').addClass('checked')
             this.refresh(this.currentpath); // MDL-31113 get latest list from server
+
+            if (Y.Resize) {
+                // We only do this is the YUI resize component is loaded
+                var node = this.filemanager.one(' > .filemanager-container');
+                var height = node.get('offsetHeight');
+                var resize = new Y.Resize({
+                    node: node,
+                    autoHide : false, // Resize handles are only shown when mouse is over the filemanager.
+                    wrap : true,
+                    handles : ['br'],
+                    defMinHeight : height,
+                    defMinWidth : 410
+                });
+                resize.on('resize:resize', function(e) {
+                    this.filemanager.setStyle('width', e.info.offsetWidth);
+                    var fmcw = this.filemanager.one('.fp-content');
+                    if (fmcw) {
+                        fmcw.setStyle('height', e.info.offsetHeight);
+                    }
+                }, this);
+            }
         },
 
         wait: function() {
diff --git a/theme/base/style/filemanager.css b/theme/base/style/filemanager.css
index b6ed919..d216e84 100644
--- a/theme/base/style/filemanager.css
+++ b/theme/base/style/filemanager.css
@@ -3,6 +3,7 @@
  */
 
 .filemanager, .file-picker {font-size:11px;color: #555555;letter-spacing: .2px;}
+.filemanager {width: 680px;}
 .filemanager a, .file-picker a {color:#555555;}
 .filemanager a:hover, .file-picker a:hover {color:#555555;text-decoration: none;}
 .filemanager select, .filemanager input, .filemanagerbutton, .filemanager textarea,