diff --git a/spec/fixtures/packages/package-with-rb-filetype/grammars/rb.cson b/spec/fixtures/packages/package-with-rb-filetype/grammars/rb.cson
new file mode 100644
index 000000000..8b4d85412
--- /dev/null
+++ b/spec/fixtures/packages/package-with-rb-filetype/grammars/rb.cson
@@ -0,0 +1,11 @@
+'name': 'Test Ruby'
+'scopeName': 'test.rb'
+'fileTypes': [
+  'rb'
+]
+'patterns': [
+  {
+    'match': 'ruby'
+    'name': 'meta.class.ruby'
+  }
+]
diff --git a/spec/fixtures/packages/package-with-rb-filetype/package.json b/spec/fixtures/packages/package-with-rb-filetype/package.json
new file mode 100644
index 000000000..350967dc5
--- /dev/null
+++ b/spec/fixtures/packages/package-with-rb-filetype/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "package-with-rb-filetype",
+  "version": "1.0.0"
+}
diff --git a/spec/grammars-spec.coffee b/spec/grammars-spec.coffee
index 92807a32e..52c7ea16c 100644
--- a/spec/grammars-spec.coffee
+++ b/spec/grammars-spec.coffee
@@ -94,6 +94,16 @@ describe "the `grammars` global", ->
         grammar2 = atom.grammars.loadGrammarSync(grammarPath2)
         expect(atom.grammars.selectGrammar('more.test', '')).toBe grammar2
 
+    it "favors non-bundled packages when breaking scoring ties", ->
+        waitsForPromise ->
+          atom.packages.activatePackage(path.join(__dirname, 'fixtures', 'packages', 'package-with-rb-filetype'))
+
+        runs ->
+          atom.grammars.grammarForScopeName('source.ruby').bundledPackage = true
+          atom.grammars.grammarForScopeName('test.rb').bundledPackage = false
+
+          expect(atom.grammars.selectGrammar('test.rb').scopeName).toBe 'test.rb'
+
     describe "when there is no file path", ->
       it "does not throw an exception (regression)", ->
         expect(-> atom.grammars.selectGrammar(null, '#!/usr/bin/ruby')).not.toThrow()
diff --git a/src/grammar-registry.coffee b/src/grammar-registry.coffee
index ce08c09ce..7b1ef823f 100644
--- a/src/grammar-registry.coffee
+++ b/src/grammar-registry.coffee
@@ -42,6 +42,7 @@ class GrammarRegistry extends FirstMate.GrammarRegistry
       score = grammar.getScore(filePath, fileContents)
       if score > highestScore or not bestMatch?
         bestMatch = grammar
+        highestScore = score
       else if score is highestScore and bestMatch?.bundledPackage
         bestMatch = grammar unless grammar.bundledPackage
     bestMatch