diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2f8e27aa8c1..18e4368e7c3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -456,7 +456,9 @@ Bug Fixes
 
 * SOLR-4176: analysis ui: javascript not properly handling URL decoding
   of input (steffkes)
-  
+
+* SOLR-4079: Long core names break web gui appearance and functionality
+  (steffkes) 
 
 Other Changes
 ----------------------
diff --git a/solr/webapp/web/css/styles/menu.css b/solr/webapp/web/css/styles/menu.css
index 13ac5a5b6c9..f77c54bf366 100644
--- a/solr/webapp/web/css/styles/menu.css
+++ b/solr/webapp/web/css/styles/menu.css
@@ -14,6 +14,8 @@
 {
   display: block;
   padding: 4px 2px;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 #menu-wrapper .active p
diff --git a/solr/webapp/web/js/scripts/app.js b/solr/webapp/web/js/scripts/app.js
index cc35a367262..4bdcff41c02 100644
--- a/solr/webapp/web/js/scripts/app.js
+++ b/solr/webapp/web/js/scripts/app.js
@@ -224,7 +224,7 @@ var solr_admin = function( app_config )
                    + '    schema="' + cores.status[core_name]['schema'] + '"'
                    + '    config="' + cores.status[core_name]['config'] + '"'
                    + '>' + "\n"
-                   + '  <p><a href="#/' + core_name + '">' + core_name + '</a></p>' + "\n"
+                   + '  <p><a href="#/' + core_name + '" title="' + core_name + '">' + core_name + '</a></p>' + "\n"
                    + '  <ul>' + "\n"
 
                    + '    <li class="ping"><a rel="' + core_path + '/admin/ping"><span>Ping</span></a></li>' + "\n"