Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1690)
+++ _whatsnew.html	(working copy)
@@ -60,6 +60,8 @@
 			JavaScript errors when calling Selection.EnsureSelection() in dialogs.</li>
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1920">#1920</a>] Fixed SSL
 			warning message when opening image and flash dialogs under HTTPS in IE6.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2000">#2000</a>] The #
+			character is now properly encoded in file names returned by the File Browser.</li>
 	</ul>
 	<h3>
 		Version 2.6 Beta 1</h3>
Index: editor/filemanager/browser/default/frmresourceslist.html
===================================================================
--- editor/filemanager/browser/default/frmresourceslist.html	(revision 1690)
+++ editor/filemanager/browser/default/frmresourceslist.html	(working copy)
@@ -87,7 +87,7 @@
 
 function OpenFile( fileUrl )
 {
-	window.top.opener.SetUrl( encodeURI( fileUrl ) ) ;
+	window.top.opener.SetUrl( encodeURI( fileUrl ).replace( '#', '%23' ) ) ;
 	window.top.close() ;
 	window.top.opener.focus() ;
 }