diff --git a/src/core/tags/AppDockTag.ts b/src/core/tags/AppDockTag.ts
index 7c258a2..68a9193 100644
--- a/src/core/tags/AppDockTag.ts
+++ b/src/core/tags/AppDockTag.ts
@@ -293,7 +293,14 @@ namespace OS {
                             }
                             if(collection.length == 1)
                             {
-                                collection[0].app.trigger("focus");
+                                if(PM.getActiveApp() == collection[0].app)
+                                {
+                                    collection[0].app.hide();
+                                }
+                                else
+                                {
+                                    collection[0].app.show();
+                                }
                                 resolve(collection[0].app);
                                 return;
                             }
diff --git a/src/core/tags/WindowTag.ts b/src/core/tags/WindowTag.ts
index 4d789f0..842fb1f 100644
--- a/src/core/tags/WindowTag.ts
+++ b/src/core/tags/WindowTag.ts
@@ -104,6 +104,7 @@ namespace OS {
                 get blur_overlay(): boolean {
                     return this.hasattr("blur-overlay");
                 }
+
                 /**
                  * Setter: set menu open event handler
                  *