diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 0fc9c72bf2f..709d7fdb028 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -52,6 +52,9 @@
 }
 
 .search-results-container {
+  max-height: 570px;
+  overflow: auto;
+  display: block;
   .search-result-item a {
   }