diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index 64f6f7541a..bc105282ac 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -185,7 +185,7 @@ class filemanager_select
 						$js = "window.opener.CKEDITOR.tools.callFunction(".
 							$content['ckeditorfuncnum'].",'".
 							htmlspecialchars($download_url)."',".
-							"'');\nwindow.close();";
+							"'');\negw(window).close();";
 					}
 					if(egw_json_response::isJSONResponse() && !($content['method'] == 'ckeditor_return'))
 					{
@@ -196,7 +196,7 @@ class filemanager_select
 						}
 						// Ahh!
 						// The vfs-select widget looks for this
-						$response->script('this.selected_files = '.json_encode($files) . '; this.close();');
+						$response->script('this.selected_files = '.json_encode($files) . '; egw(this).close();');
 					}
 					else
 					{