diff --git a/src/ServicePulse.Host/app/css/particular.css b/src/ServicePulse.Host/app/css/particular.css
index 206e82ad2a..6a7fba1075 100644
--- a/src/ServicePulse.Host/app/css/particular.css
+++ b/src/ServicePulse.Host/app/css/particular.css
@@ -2192,6 +2192,11 @@ i.fa.pa-endpoint-lost.endpoints-overview, i.fa.pa-monitoring-lost.endpoints-over
         max-width: 76%;
         float: left;
     }
+
+    .col-lg-max-10 {
+        max-width: 88%;
+        float: left;
+    }
 }
 
 section[name="message_groups"] .list-section {
diff --git a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
index f684044b14..f198261689 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
+++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
@@ -7,23 +7,22 @@
             <span class="fake-link" aria-hidden="true">&#9664;</span>
             <a href="/#/monitored_endpoints">All endpoints</a>
         </div>
-        <div class="col-sm-9 no-side-padding list-section">
-            <h1 uib-tooltip="{{endpointName}}">
-                <div class="righ-side-ellipsis">{{endpointName}}</div>
-                <div class="endpoint-status">
-                    <span ng-if="endpoint.isStale" class="warning">
-                        <i class="fa pa-endpoint-lost endpoint-details" uib-tooltip="Unable to connect to endpoint"></i>
-                    </span>
-                    <span class="warning" ng-if="endpoint.isScMonitoringDisconnected">
-                        <i class="fa pa-monitoring-lost endpoint-details" uib-tooltip="Unable to connect to monitoring server"></i>
-                    </span>
-                    <a ng-if="endpoint.errorCount" class="warning" href="#/failed-messages/groups/{{endpointName}}/{{sourceIndex}}/{{endpoint.serviceControlId}}">
-                        <i class="fa fa-envelope" uib-tooltip="{{endpoint.errorCount | metricslargenumber}} failed messages associated with this endpoint. Click to see list."></i>
-                        <span class="badge badge-important ng-binding">{{endpoint.errorCount | metricslargenumber}}</span>
-                    </a>
-                </div>
-
+        <div class="col-sm-9 no-side-padding list-section ">
+            <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
+                {{endpointName}}
             </h1>
+            <div class="endpoint-status col-lg-2">
+                <span ng-if="endpoint.isStale" class="warning">
+                    <i class="fa pa-endpoint-lost endpoint-details" uib-tooltip="Unable to connect to endpoint"></i>
+                </span>
+                <span class="warning" ng-if="endpoint.isScMonitoringDisconnected">
+                    <i class="fa pa-monitoring-lost endpoint-details" uib-tooltip="Unable to connect to monitoring server"></i>
+                </span>
+                <a ng-if="endpoint.errorCount" class="warning" href="#/failed-messages/groups/{{endpointName}}/{{sourceIndex}}/{{endpoint.serviceControlId}}">
+                    <i class="fa fa-envelope" uib-tooltip="{{endpoint.errorCount | metricslargenumber}} failed messages associated with this endpoint. Click to see list."></i>
+                    <span class="badge badge-important ng-binding">{{endpoint.errorCount | metricslargenumber}}</span>
+                </a>
+            </div>
         </div>
         <div class="col-sm-3 no-side-padding toolbar-menus">
             <ul class="nav nav-pills period-selector">