diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index 7b16cedc9f..95aed28c77 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -24,7 +24,7 @@ if (window.opener && typeof window.opener.egw == 'object')
 {
 	egw = window.opener.egw;
 }
-else if (window.top == 'object' && window.top.egw == 'object')
+else if (window.top && typeof window.top.egw == 'object')
 {
 	egw = window.top.egw;
 }
diff --git a/phpgwapi/js/jsapi/jsapi.js b/phpgwapi/js/jsapi/jsapi.js
index 849019c6db..5c5d6ec2b8 100644
--- a/phpgwapi/js/jsapi/jsapi.js
+++ b/phpgwapi/js/jsapi/jsapi.js
@@ -265,7 +265,7 @@ function egw_refresh(_msg, _app, _id, _type, _targetapp, _replace, _with)
  */
 function egw_open(id, app, type, extra, target)
 {
-	window.egw.open();
+	window.egw.open(id, app, type, extra, target);
 }
 
 window.egw_getFramework = function()