diff --git a/src/app/cursor-view.coffee b/src/app/cursor-view.coffee
index a551a454d..8c64cfc05 100644
--- a/src/app/cursor-view.coffee
+++ b/src/app/cursor-view.coffee
@@ -30,6 +30,9 @@ class CursorView extends View
     @cursor.on 'destroyed.cursor-view', =>
       @needsRemoval = true
 
+    if @cursor.marker.isRemote()
+      @addClass("site-#{@cursor.marker.getOriginSiteId()}") 
+
   remove: ->
     @editor.removeCursorView(this)
     @cursor.off('.cursor-view')
diff --git a/themes/atom-dark-ui/collaboration.less b/themes/atom-dark-ui/collaboration.less
index a63464a62..dbb1e0f7e 100644
--- a/themes/atom-dark-ui/collaboration.less
+++ b/themes/atom-dark-ui/collaboration.less
@@ -7,15 +7,21 @@
 @site-4-color: #f4541e;
 
 .site-colors(@site, @color) {
-  .site-@{site} {
-    background-color: @color;
-    &.lighter {
-      background-color: lighten(@color, 30%);
+  .collaboration-participant{
+    .site-@{site} {
+      background-color: @color;
+      &.lighter {
+        background-color: lighten(@color, 30%);
+      }
     }
   }
   .editor .selection.site-@{site} .region {
     background-color: darken(@color, 30%);
   }
+  .editor .cursor.site-@{site} {
+    border-color: @color;
+    border-width: 2px;
+  }
 }
 
 .site-colors(1, @site-1-color);