diff --git a/Wox.Infrastructure/StringMatcher.cs b/Wox.Infrastructure/StringMatcher.cs
index c4d340efa7..5d5a9b9a8c 100644
--- a/Wox.Infrastructure/StringMatcher.cs
+++ b/Wox.Infrastructure/StringMatcher.cs
@@ -210,7 +210,11 @@ namespace Wox.Infrastructure
             }
 
             if (allSubstringsContainedInCompareString)
-                score += 10 * string.Concat(query.Where(c => !char.IsWhiteSpace(c))).Count();
+            {
+                int count = query.Count(c => !char.IsWhiteSpace(c));
+                int factor = count < 4 ? 10 : 5;
+                score += factor * count;
+            }
 
             return score;
         }
diff --git a/Wox.Test/FuzzyMatcherTest.cs b/Wox.Test/FuzzyMatcherTest.cs
index 1a82559874..b7e0374f04 100644
--- a/Wox.Test/FuzzyMatcherTest.cs
+++ b/Wox.Test/FuzzyMatcherTest.cs
@@ -121,13 +121,13 @@ namespace Wox.Test
             }
         }
 
-        [TestCase(Chrome, Chrome, 167)]
-        [TestCase(Chrome, LastIsChrome, 113)]
+        [TestCase(Chrome, Chrome, 137)]
+        [TestCase(Chrome, LastIsChrome, 83)]
         [TestCase(Chrome, HelpCureHopeRaiseOnMindEntityChrome, 21)]
         [TestCase(Chrome, UninstallOrChangeProgramsOnYourComputer, 15)]
         [TestCase(Chrome, CandyCrushSagaFromKing, 0)]
         [TestCase("sql", MicrosoftSqlServerManagementStudio, 56)]
-        [TestCase("sql  manag", MicrosoftSqlServerManagementStudio, 119)]//double spacing intended
+        [TestCase("sql  manag", MicrosoftSqlServerManagementStudio, 79)]//double spacing intended
         public void WhenGivenQueryStringThenShouldReturnCurrentScoring(string queryString, string compareString, int expectedScore)
         {
             // When, Given