diff --git a/o2web/source/x_component_cms_Index/Newer.js b/o2web/source/x_component_cms_Index/Newer.js
index 71f11f8d877c975f36080cf5ac52c00383f64a6a..b4a5c6ea178d7e51417cbe4974f2957fa030ded8 100644
--- a/o2web/source/x_component_cms_Index/Newer.js
+++ b/o2web/source/x_component_cms_Index/Newer.js
@@ -507,7 +507,7 @@ MWF.xApplication.cms.Index.Newer = new Class({
         var _self = this;
 
         var appId = "cms.Document"+id;
-        if (_self.app.desktop.apps[appId]){
+        if (_self.app.desktop && _self.app.desktop.apps && _self.app.desktop.apps[appId]){
             _self.app.desktop.apps[appId].setCurrent();
         }else {
             var options = {
diff --git a/o2web/source/x_component_cms_Index/Starter.js b/o2web/source/x_component_cms_Index/Starter.js
index 31df9adf9de60e0f2da2c4dbb896cc331f79e1f2..78dd28296cba9bec36a07aa1bfdf371c2e581b4f 100644
--- a/o2web/source/x_component_cms_Index/Starter.js
+++ b/o2web/source/x_component_cms_Index/Starter.js
@@ -94,7 +94,7 @@ MWF.xApplication.cms.Index.Starter = new Class({
         var _self = this;
 
         var appId = "cms.Document"+id;
-        if (_self.app.desktop.apps[appId]){
+        if (_self.app.desktop && _self.app.desktop.apps && _self.app.desktop.apps[appId]){
             _self.app.desktop.apps[appId].setCurrent();
         }else {
             var options = {