diff --git a/build/css/main.css b/build/css/main.css
index 4b872a6e..0aeefa0e 100644
--- a/build/css/main.css
+++ b/build/css/main.css
@@ -6410,6 +6410,10 @@ body {
 .component-drive-selector-body .list-group-item-footer {
   margin-top: 8px; }
 
+.component-drive-selector-body .list-group-item-heading,
+.component-drive-selector-body .list-group-item-text {
+  word-break: break-all; }
+
 /*
  * Copyright 2016 resin.io
  *
diff --git a/lib/gui/components/drive-selector/styles/_drive-selector.scss b/lib/gui/components/drive-selector/styles/_drive-selector.scss
index 95ea602f..bde65672 100644
--- a/lib/gui/components/drive-selector/styles/_drive-selector.scss
+++ b/lib/gui/components/drive-selector/styles/_drive-selector.scss
@@ -19,6 +19,15 @@
   height: 320px;
 }
 
-.component-drive-selector-body .list-group-item-footer {
-  margin-top: 8px;
+.component-drive-selector-body {
+
+  .list-group-item-footer {
+    margin-top: 8px;
+  }
+
+  .list-group-item-heading,
+  .list-group-item-text {
+    word-break: break-all;
+  }
 }
+