diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/images.js b/main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/images.js
index 87f0ec8176..f0623ba7b1 100644
--- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/images.js
+++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/images.js
@@ -45,7 +45,8 @@
 
 	function selectImage(filename, alt, width, height) 
 	{
-		var topDoc = window.top.document;
+		//var topDoc = window.top.document;
+		var topDoc = window.parent.document;
 		
 		var obj = topDoc.getElementById('f_file');  obj.value = filename;
 		var obj = topDoc.getElementById('f_url');  obj.value = filename;		
diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/popup.js b/main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/popup.js
index 715c30d751..0adf29fe19 100644
--- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/popup.js
+++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/popup.js
@@ -133,8 +133,16 @@ function __dlg_translate(i18n) {
 
 // closes the dialog and passes the return info upper.
 function __dlg_close(val) {
-	opener.Dialog._return(val);
-	window.close();
+	if ( opener )
+	{
+		opener.Dialog._return(val);
+		window.close();
+	}
+	else if ( window.parent )
+	{
+		oEditor.Dialog._return(val);
+		window.parent.CloseDialog() ;
+	}
 };
 
 function __dlg_close_on_esc(ev) {
diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js b/main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js
index e3c21fe9f6..98c0ad2874 100644
--- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js
+++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js
@@ -232,6 +232,11 @@ function Dialog(url, action, init) {
 	if ( FCKConfig.OpenImageManagerInANewWindow && FCKConfig.OpenImageManagerInANewWindow.toString() == 'true' ) {
 		Dialog._geckoOpenModal(url, action, init);
 	} else {
+		Dialog._return = function (val) {
+			if (val && action) {
+				action(val);
+			}
+		};
 		Dialog._arguments = init;
 		FCKDialog.OpenDialog( 'FCKDialog_ImageManager', 'Image Manager', url, 800, 600 ) ;
 	}