diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js
index 446ec8f7ef..4c589c620e 100644
--- a/phpgwapi/js/framework/fw_browser.js
+++ b/phpgwapi/js/framework/fw_browser.js
@@ -153,6 +153,11 @@ var fw_browser =  Class.extend({
 			targetUrl = "index.php?menuaction=" + matches[1];
 			useIframe = false;
 		}
+		// External link, but we'd still like to use everything without iframe
+		if(_url.indexOf('no_popup=1') > 0)
+		{
+			useIframe = false;
+		}
 
 		// Destroy application js
 		if(window.app[this.app.appName] && window.app[this.app.appName].destroy)