diff --git a/ui/index.html b/ui/index.html
index b5d241732a..2c51e33a92 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -501,7 +501,7 @@
           <div class="list-group-item list-condensed double-line">
             <div class="bg-light-gray list-bar-horizontal"></div>
             <div class="name">
-              {{session.ID}}
+              {{ sessionName session }}
               <button {{ action "invalidateSession" session.ID }} {{ bind-attr class=":btn :btn-danger :pull-right :btn-list isLoading:btn-warning" }}>Invalidate</button>
             </div>
               <ul class="list-inline sub">
diff --git a/ui/javascripts/app/helpers.js b/ui/javascripts/app/helpers.js
index 71abbb1920..32f87f0dba 100644
--- a/ui/javascripts/app/helpers.js
+++ b/ui/javascripts/app/helpers.js
@@ -19,3 +19,11 @@ Ember.Handlebars.helper('listBar', function(status) {
   }
   return new Handlebars.SafeString('<div class="list-bar-horizontal ' + highlightClass + '"></div>');
 });
+
+Ember.Handlebars.helper('sessionName', function(session) {
+  if (session.Name === "") {
+    return session.ID;
+  } else {
+    return new Handlebars.SafeString(session.Name + ' <small>' + session.ID + '</small>');
+  }
+});