diff --git a/pkg/shell/indexes.js b/pkg/shell/indexes.js
index 1dec2aee24c..18353b7e34e 100644
--- a/pkg/shell/indexes.js
+++ b/pkg/shell/indexes.js
@@ -284,7 +284,6 @@ var phantom_checkpoint = phantom_checkpoint || function () { };
             $("#host-nav-item span.pficon-container-node").css("color", color);
 
             if (machine) {
-
                 $("#machine-link span").text(machine.label);
                 $("#machine-link").attr("title", machine.label);
             } else {
@@ -323,14 +322,11 @@ var phantom_checkpoint = phantom_checkpoint || function () { };
             });
 
             $("#host-nav-item").toggleClass("active", !!machine);
-            if (machine) {
+            if (machine)
                 update_sidebar(machine, state, compiled);
-                $("#host-nav").show();
-            } else {
-                $("#host-nav").hide();
-            }
-            update_machine_links(machine);
 
+            $("#host-nav").toggleClass("hidden", !machine);
+            update_machine_links(machine);
             $('.flex-body').toggleClass("single-nav", $(".dashboard-link").length < 2);
         }
 
diff --git a/pkg/shell/switcher.less b/pkg/shell/switcher.less
index 592be94465e..2f45bf45eb4 100644
--- a/pkg/shell/switcher.less
+++ b/pkg/shell/switcher.less
@@ -58,6 +58,7 @@
     width: 15em;
     position: relative;
     z-index: 2;
+    opacity: 1;
 
     /* Fade start and end of the host menu to indicate more content is available */