diff --git a/res/app/device-list/device-list-details-directive.js b/res/app/device-list/device-list-details-directive.js
index dab0d8b2..3f47a399 100644
--- a/res/app/device-list/device-list-details-directive.js
+++ b/res/app/device-list/device-list-details-directive.js
@@ -347,6 +347,9 @@ var directive = module.exports = function DeviceListDetailsDirective(
       tracker.on('change', changeListener)
       tracker.on('remove', removeListener)
 
+      // Maybe we're already late
+      tracker.devices.forEach(addListener)
+
       scope.$on('$destroy', function() {
         tracker.removeListener('add', addListener)
         tracker.removeListener('change', changeListener)
diff --git a/res/app/device-list/device-list-empty-directive.js b/res/app/device-list/device-list-empty-directive.js
index a4986907..dcf224aa 100644
--- a/res/app/device-list/device-list-empty-directive.js
+++ b/res/app/device-list/device-list-empty-directive.js
@@ -8,7 +8,7 @@ module.exports = function DeviceListEmptyDirective() {
   , link: function (scope) {
       var tracker = scope.tracker()
 
-      scope.empty = true
+      scope.empty = !tracker.devices.length
 
       function update() {
         var oldEmpty = scope.empty
diff --git a/res/app/device-list/device-list-icons-directive.js b/res/app/device-list/device-list-icons-directive.js
index 0ad14c51..dffe73fc 100644
--- a/res/app/device-list/device-list-icons-directive.js
+++ b/res/app/device-list/device-list-icons-directive.js
@@ -345,6 +345,9 @@ module.exports = function DeviceListDetailsDirective(
       tracker.on('change', changeListener)
       tracker.on('remove', removeListener)
 
+      // Maybe we're already late
+      tracker.devices.forEach(addListener)
+
       scope.$on('$destroy', function() {
         tracker.removeListener('add', addListener)
         tracker.removeListener('change', changeListener)
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 723dee7b..2ebd541c 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -7,12 +7,12 @@ div.stf-device-list
     .col-md-12
       .widget-container.fluid-height
         .widget-content.padded
-          tabset.overflow-auto.device-list-active-tabs
-            tab(active='false')
+          tabset.overflow-auto.device-list-active-tabs(ng-if='activeTabs')
+            tab(active='activeTabs.icons')
               tab-heading
                 i.fa.fa-th-large
                 span(translate) Devices
-              div.device-list-devices-content
+              div.device-list-devices-content(ng-if='activeTabs.icons')
                 .filtering-buttons.pull-right
                   input(type='search',results='5', autosave='deviceSearch'
                   name='deviceSearch', ng-model='deviceSearch', ng-change='deviceSearchChanged()',
@@ -27,11 +27,11 @@ div.stf-device-list
 
                 device-list-icons(tracker='tracker', sort='sort')
 
-            tab(active='true')
+            tab(active='activeTabs.details')
               tab-heading
                 i.fa.fa-list
                 span(translate) Details
-              div.device-list-details-content
+              div.device-list-details-content(ng-if='activeTabs.details')
                 .filtering-buttons
                   div(ng-show='ngTableEnabled')
                     clear-button(ng-click="clearSorting()")