Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 5829)
+++ /CKEditor/trunk/CHANGES.html	(revision 5830)
@@ -39,4 +39,7 @@
 	<p>
 			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5308">#5308</a> : Introduced the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.filebrowserWindowFeatures">filebrowserWindowFeatures</a> setting, making it possible to have custom window features in the file browser window.</li>
+	</ul>
 	<p>
 			Fixed issues:</p>
Index: /CKEditor/trunk/_source/plugins/filebrowser/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/filebrowser/plugin.js	(revision 5829)
+++ /CKEditor/trunk/_source/plugins/filebrowser/plugin.js	(revision 5830)
@@ -175,5 +175,5 @@
 
 		var url = addQueryString( this.filebrowser.url, params );
-		editor.popup( url, width, height );
+		editor.popup( url, width, height, editor.config.fileBrowserWindowFeatures );
 	}
 
@@ -480,2 +480,12 @@
  * config.filebrowserImageBrowseLinkUrl = '/browser/browse.php';
  */
+
+/**
+ * The "features" to use in the file browser popup window.
+ * @name CKEDITOR.config.filebrowserWindowFeatures
+ * @since 3.4.1
+ * @type String
+ * @default 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes'
+ * @example
+ * config.filebrowserWindowFeatures = 'resizable=yes,scrollbars=no';
+ */
Index: /CKEditor/trunk/_source/plugins/popup/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/popup/plugin.js	(revision 5829)
+++ /CKEditor/trunk/_source/plugins/popup/plugin.js	(revision 5830)
@@ -4,5 +4,5 @@
 */
 
-CKEDITOR.plugins.add( 'popup');
+CKEDITOR.plugins.add( 'popup' );
 
 CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
@@ -14,6 +14,7 @@
 	 * @param {String} width Popup window width.
 	 * @param {String} height Popup window height.
+	 * @param {String} options Popup window features.
 	 */
-	popup : function( url, width, height )
+	popup : function( url, width, height, options )
 	{
 		width = width || '80%';
@@ -34,5 +35,5 @@
 		var top = parseInt( ( window.screen.height - height ) / 2, 10 ),
 			left = parseInt( ( window.screen.width  - width ) / 2, 10 ),
-			options = 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes' +
+			options = ( options || 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes' ) +
 			',width='  + width +
 			',height=' + height +
@@ -58,5 +59,5 @@
 		}
 
-		return true ;
+		return true;
 	}
 });