diff --git a/spec/app/text-mate-scope-selector-spec.coffee b/spec/app/text-mate-scope-selector-spec.coffee
index 82ad293d2..5baf2455a 100644
--- a/spec/app/text-mate-scope-selector-spec.coffee
+++ b/spec/app/text-mate-scope-selector-spec.coffee
@@ -74,5 +74,6 @@ describe "TextMateScopeSelector", ->
       expect(new TextMateScopeSelector('a - b').toCssSelector()).toBe '.a:not(.b)'
       expect(new TextMateScopeSelector('a & b').toCssSelector()).toBe '.a .b'
       expect(new TextMateScopeSelector('a & -b').toCssSelector()).toBe '.a:not(.b)'
-      expect(new TextMateScopeSelector('a | b').toCssSelector()).toBe '.a .b'
+      expect(new TextMateScopeSelector('a | b').toCssSelector()).toBe '.a, .b'
       expect(new TextMateScopeSelector('a - (b.c d)').toCssSelector()).toBe '.a:not(.b.c .d)'
+      expect(new TextMateScopeSelector('a, b').toCssSelector()).toBe '.a, .b'
diff --git a/src/app/text-mate-scope-selector-matchers.coffee b/src/app/text-mate-scope-selector-matchers.coffee
index 59839ac4b..4d58c7e84 100644
--- a/src/app/text-mate-scope-selector-matchers.coffee
+++ b/src/app/text-mate-scope-selector-matchers.coffee
@@ -58,7 +58,7 @@ class OrMatcher
 
   matches: (scopes) -> @left.matches(scopes) or @right.matches(scopes)
 
-  toCssSelector: -> "#{@left.toCssSelector()} #{@right.toCssSelector()}"
+  toCssSelector: -> "#{@left.toCssSelector()}, #{@right.toCssSelector()}"
 
 class AndMatcher
   constructor: (@left, @right) ->