diff --git a/www/assets/app.js b/www/assets/app.js
index 0e0f8bb..66f6f36 100644
--- a/www/assets/app.js
+++ b/www/assets/app.js
@@ -156,6 +156,14 @@
             $scope.$apply();
           }, 1000);
         }
+
+        var i = response.data;
+        for (var k in i.instances) {
+          var instance = i.instances[k];
+          $scope.instances.push(instance);
+          $scope.idx[instance.name] = instance;
+        }
+
         var socket = io({ path: '/sessions/' + sessionId + '/ws' });
 
         socket.on('session ready', function(ready) {
@@ -247,12 +255,6 @@
 
         $scope.socket = socket;
 
-        var i = response.data;
-        for (var k in i.instances) {
-          var instance = i.instances[k];
-          $scope.instances.push(instance);
-          $scope.idx[instance.name] = instance;
-        }
 
         // If instance is passed in URL, select it
         let inst = $scope.idx[$location.hash()];
diff --git a/www/index.html b/www/index.html
index 0de73e5..4b76205 100644
--- a/www/index.html
+++ b/www/index.html
@@ -51,7 +51,7 @@
                     <settings-icon></settings-icon><br/>
                   </div>
                   <div class="md-toolbar-tools">
-                      <md-switch ng-disabled="instances.length > 0" ng-model="type.windows">
+                      <md-switch ng-model="type.windows">
                           Windows containers {{windows}}
                       </md-switch>
                   </div>