diff --git a/Wox/Commands/CommandFactory.cs b/Wox/Commands/CommandFactory.cs
index 1df62d5c01..b248afa716 100644
--- a/Wox/Commands/CommandFactory.cs
+++ b/Wox/Commands/CommandFactory.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using Wox.Helper;
 using Wox.Plugin;
+using Wox.PluginLoader;
 
 namespace Wox.Commands
 {
@@ -24,8 +25,14 @@ namespace Wox.Commands
                 systemCmd = new SystemCommand();
             }
 
-            systemCmd.Dispatch(query);
-            pluginCmd.Dispatch(query);
+            if (Plugins.HitThirdpartyKeyword(query))
+            {
+                pluginCmd.Dispatch(query);
+            }
+            else
+            {
+                systemCmd.Dispatch(query);                
+            }
         }
     }
 }