diff --git a/res/app/control-panes/dashboard/browser/browser-controller.js b/res/app/control-panes/dashboard/browser/browser-controller.js
index a8edc41d..9a406161 100644
--- a/res/app/control-panes/dashboard/browser/browser-controller.js
+++ b/res/app/control-panes/dashboard/browser/browser-controller.js
@@ -5,9 +5,11 @@ module.exports = function BrowserCtrl($scope, $rootScope) {
   function setCurrentBrowser(device) {
     if (device && device.browser && device.browser.apps) {
       var currentBrowser = {}
-      var selectedBrowser = _.first(device.browser.apps, 'selected')
-      if (!_.isEmpty(selectedBrowser)) {
-        currentBrowser = selectedBrowser[0]
+      if (device.browser.selected) {
+        var selectedBrowser = _.first(device.browser.apps, 'selected')
+        if (!_.isEmpty(selectedBrowser)) {
+          currentBrowser = selectedBrowser[0]
+        }
       } else {
         currentBrowser = _.first(device.browser.apps)
       }
diff --git a/res/app/control-panes/dashboard/browser/browser.jade b/res/app/control-panes/dashboard/browser/browser.jade
index d93c9210..d1fa7c3b 100644
--- a/res/app/control-panes/dashboard/browser/browser.jade
+++ b/res/app/control-panes/dashboard/browser/browser.jade
@@ -9,15 +9,16 @@
       i.fa.fa-refresh
       span(translate) Relaunch
   .widget-content.padded
+    //pre {{device.browser|json}}
     .btn-group
       button.btn.btn-default-outline.dropdown-toggle
         //img(ng-src='/img/platforms/{{$root.browser}}.png').browser-icon
         //| {{$root.browser | browserName}}
-        span {{$root.browser.type}}
-        span.caret
-      ul.dropdown-menu
+        span(ng-show='$root.browser') {{$root.browser.name}} ({{$root.browser.type}})
+        span.caret(ng-show='device.browser.apps.length > 1')
+      ul.dropdown-menu(ng-show='device.browser.apps.length > 1')
         li(ng-repeat='b in device.browser.apps')
           a(ng-click='$root.browser = b').pointer
-            span {{b.type}}
+            span {{b.name}} ({{b.type}})
             //img(ng-src='/img/platforms/{{b}}.png').browser-icon.pointer
             //| {{ b | browserName }}
\ No newline at end of file