diff --git a/Inquirer.js b/Inquirer.js
index 55db581..2020f65 100644
--- a/Inquirer.js
+++ b/Inquirer.js
@@ -164,7 +164,7 @@
     }
 
     function show() {
-        getApp().focus();
+        getApp().show();
     }
 
     function hide() {
diff --git a/Merger.js b/Merger.js
index 199fca4..eb4efc3 100644
--- a/Merger.js
+++ b/Merger.js
@@ -86,10 +86,14 @@
                         DragNDrop.update(e.clientX, e.clientY);
                 });
                 dsk.addEventListener("click", function (e) {
-                    if (menuCurrent)
+                    if (menuCurrent) {
                         menuCurrent.close(true);
-                    if (menuToShow)
+                        menuCurrent = undefined;
+                    }
+                    if (menuToShow) {
                         menuToShow.popup();
+                        menuToShow = undefined;
+                    }
                 });
             }
             return dsk;
@@ -219,18 +223,18 @@
         function switchApplication(a) {
             var i, m, ax, menu = getMenu();
             if (!a)
-                if (sys.selectedApp && a == sys.selectedApp)
-                    a = sys.selectedApp;
+                if (selectedApp && a == selectedApp)
+                    a = selectedApp;
                 else
                     if (Object.keys(apps).length > 0)
                         a = apps[Object.keys(apps)[0]];
                     else return false;
             if (typeof a === "string") {
-                a = app[a]
+                a = apps[a]
                 if (!a)
                     return false;
             }
-            sys.selectedApp = a;
+            selectedApp = a;
             menu.sysMenu.setIcon(a.icon ? a.icon : sys.icon);
             menu.sysMenu.setText(a.title ? a.title : a.id);
             menu.sysMenu.items = [];
@@ -286,7 +290,7 @@
 
         /** Check if menu is marked as current */
         function menu_isCurrent(menu) {
-            return menuCurrent = menu;
+            return menuCurrent == menu;
         }
 
         this.merge({