diff --git a/static/css/directives/ui/entity-reference.css b/static/css/directives/ui/entity-reference.css
index 68962114e..7bb4b24be 100644
--- a/static/css/directives/ui/entity-reference.css
+++ b/static/css/directives/ui/entity-reference.css
@@ -47,3 +47,11 @@
 .entity-reference-element i.fa-group {
   margin-right: 4px;
 }
+
+.entity-reference-element .robot-shortname {
+  max-width: 250px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: inline-block;
+  vertical-align: text-bottom;
+}
\ No newline at end of file
diff --git a/static/directives/entity-reference.html b/static/directives/entity-reference.html
index 5f2d9c242..71fd5c779 100644
--- a/static/directives/entity-reference.html
+++ b/static/directives/entity-reference.html
@@ -32,12 +32,10 @@
         <span ng-if="entity.is_robot">
           <i class="fa ci-robot fa-lg"></i>
           <a class="entity-name" ng-if="getIsAdmin(getPrefix(entity.name))" ng-click="showRobotCredentials()">
-            <span class="prefix">{{ getPrefix(entity.name) }}+</span>
-            <span>{{ getShortenedName(entity.name) }}</span>
+            <span class="prefix">{{ getPrefix(entity.name) }}+</span><span class="robot-shortname">{{ getShortenedName(entity.name) }}</span>
           </a>
           <span class="entity-name" ng-if="!getIsAdmin(getPrefix(entity.name))">
-            <span class="prefix">{{ getPrefix(entity.name) }}+</span>
-            <span>{{ getShortenedName(entity.name) }}</span>
+            <span class="prefix">{{ getPrefix(entity.name) }}+</span><span class="robot-shortname">{{ getShortenedName(entity.name) }}</span>
           </span>
         </span>
       </span>