diff --git a/res/app/control-panes/device-control/device-control.css b/res/app/control-panes/device-control/device-control.css
index 8c836b42..fa2e4420 100644
--- a/res/app/control-panes/device-control/device-control.css
+++ b/res/app/control-panes/device-control/device-control.css
@@ -116,6 +116,11 @@ device-screen textarea {
   color: #858585;
 }
 
+.stf-device-control .device-name-container {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .stf-device-control .stf-vnc-device-name .device-small-image {
   margin-left: 10px;
 }
diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade
index 314884aa..9ea4b7d3 100644
--- a/res/app/control-panes/device-control/device-control.jade
+++ b/res/app/control-panes/device-control/device-control.jade
@@ -18,12 +18,12 @@
             i(ng-show='showScreen', tooltip-html-unsafe='{{"Just control device"|translate}}<br /><code>⌘-⇧-O</code>', tooltip-placement='left').fa.fa-eye
             i(ng-show='!showScreen', tooltip-html-unsafe='{{"View device"|translate}}<br /><code>⌘-⇧-O</code>', tooltip-placement='left').fa.fa-eye-slash
 
-        div
+        .device-name-containerX
           a.stf-vnc-device-name.pointer.unselectable.dropdown-toggle
             p
               .device-small-image
                 img(ng-src='{{device.image ? "/static/devices/" + device.image : "/static/bower_components/stf-graphics/devices/small/default.jpg" }}')
-              span {{ device.name }}
+              span.device-name-text {{ device.name }}
               span.caret(ng-show='groupDevices.length > 0')
             span(ng-show='device && !device.present', translate) (Absent)