diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index 2eeb34ec0b4..d8c3942bc24 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -68,9 +68,9 @@
   }
 
   .search-item {
+    word-wrap: break-word;
     display: block;
     padding: 3px 10px;
-    white-space: nowrap;
     background-color: $grafanaListBackground;
     margin-bottom: 4px;
 
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 67a694de666..beaf463fa8f 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -57,6 +57,7 @@ div.flot-text {
   min-height: 9px;
   padding-top: 4px;
   cursor: pointer;
+  word-wrap: break-word;
 }
 
 .panel-title {