diff --git a/o2web/source/o2_core/o2/xDesktop/Default.js b/o2web/source/o2_core/o2/xDesktop/Default.js
index 317a833c3c8abafaf068437e0d6310a0783e6f65..3c0a6b896154192179eee35ac4cec621eef1bfbc 100644
--- a/o2web/source/o2_core/o2/xDesktop/Default.js
+++ b/o2web/source/o2_core/o2/xDesktop/Default.js
@@ -843,8 +843,7 @@ o2.xDesktop.Default = new Class({
                 if (i && this.apps[keys[i-1]] && this.apps[keys[i-1]].setCurrent){
                     this.apps[keys[i-1]].setCurrent();
                 }else{
-                    //if (app.appId!=="Homepage") layout.openApplication(null, "Homepage");
-                    layout.openApplication(null, "Homepage");
+                    this.loadDefaultPage()
                 }
             }
             this.checkTaskBarSize();
diff --git a/o2web/source/x_component_Common/Main.js b/o2web/source/x_component_Common/Main.js
index f526e7fcf44801cdfa9418272bb98110786359a2..5650ab3ba5f06ec4d8154a444e8e287dd8a56a70 100644
--- a/o2web/source/x_component_Common/Main.js
+++ b/o2web/source/x_component_Common/Main.js
@@ -405,33 +405,28 @@ MWF.xApplication.Common.Main = new Class({
 		//		});
 	},
 	setCurrent: function () {
-		if (this.desktop.currentApp == this) return true;
-		if (this.desktop.currentApp) {
-			this.desktop.currentApp.setUncurrent();
-		}
-
-		// if (layout.viewMode=="Default" && !this.isLoadApplication){
-		// 	this.isLoadApplication = true;
-		// 	this.load(true);
-		// } else {
-			this.window.setCurrent();
-
-			if (this.window.isHide) {
-				if (this.window.isMax) {
-					this.window.maxSize(function () { this.fireAppEvent("current"); }.bind(this));
-				} else {
-					this.window.restore(function () { this.fireAppEvent("current"); }.bind(this));
-				}
-			} else {
-				this.fireAppEvent("current");
-			}
-
-			if (this.taskitem) this.taskitem.selected();
-			this.desktop.currentApp = this;
-
-			this.desktop.appCurrentList.erase(this);
-			this.desktop.appCurrentList.push(this);
-		//}
+        if (this.desktop.currentApp == this) return true;
+        if (this.desktop.currentApp) {
+            this.desktop.currentApp.setUncurrent();
+        }
+
+        this.window.setCurrent();
+
+        if (this.taskitem) this.taskitem.selected();
+        this.desktop.currentApp = this;
+
+        this.desktop.appCurrentList.erase(this);
+        this.desktop.appCurrentList.push(this);
+
+        if (this.window.isHide) {
+            if (this.window.isMax) {
+                this.window.maxSize(function () { this.fireAppEvent("current"); }.bind(this));
+            } else {
+                this.window.restore(function () { this.fireAppEvent("current"); }.bind(this));
+            }
+        } else {
+            this.fireAppEvent("current");
+        }
 	},
 	setUncurrent: function () {
 		if (this.desktop.currentApp == this) {