diff --git a/res/app/control-panes/device-control/device-control-controller.js b/res/app/control-panes/device-control/device-control-controller.js
index 04657c0b..81c30241 100644
--- a/res/app/control-panes/device-control/device-control-controller.js
+++ b/res/app/control-panes/device-control/device-control-controller.js
@@ -1,3 +1,5 @@
+var _ = require('lodash')
+
 module.exports = function DeviceControlCtrl($scope, $rootScope, DeviceService, GroupService, $location) {
 
   $scope.groupTracker = DeviceService.trackGroup($scope)
diff --git a/res/app/control-panes/device-control/device-control.css b/res/app/control-panes/device-control/device-control.css
index c59de8f9..292f90d1 100644
--- a/res/app/control-panes/device-control/device-control.css
+++ b/res/app/control-panes/device-control/device-control.css
@@ -58,12 +58,12 @@ device-screen textarea {
 }
 
 .stf-device-control .kick-device {
-  color: gray;
+  color: #9c9c9c;
   margin-left: 25px;
 }
 
 .stf-device-control .kick-device:hover {
-  color: red;
+  color: #d9534f;
 }
 
 .stf-device-control .kick-device i {
@@ -109,6 +109,14 @@ device-screen textarea {
   color: #858585;
 }
 
+.stf-device-control .stf-vnc-device-name .device-small-image {
+  margin-left: 10px;
+}
+
+.stf-device-control .current-device {
+  font-weight: bold;
+}
+
 .stf-vnc-navbar {
   background: #fff;
   margin-bottom: 2px;
diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade
index b8d61300..032b5892 100644
--- a/res/app/control-panes/device-control/device-control.jade
+++ b/res/app/control-panes/device-control/device-control.jade
@@ -32,13 +32,11 @@
               a(ng-click='controlDevice(groupDevice); $event.stopPropagation()')
                 .device-small-image
                   img(ng-src='{{groupDevice.image ? "/static/devices/" + groupDevice.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
-                span {{ groupDevice.name }}
+                span(ng-class='{"current-device": groupDevice.serial === $root.device.serial }') {{ groupDevice.name }}
 
                 span.pull-right(ng-click='kickDevice(groupDevice); $event.stopPropagation()').kick-device
                   i.fa.fa-times
 
-
-
       .as-row.fill-height(ng-file-drop='$root.install($files)')
         div(ng-controller='DeviceScreenCtrl')
           device-screen(style='width: 400px; height: 600px; background: gray')