diff --git a/CriticalPathAnalyzer/CriticalPathAnalyzer/FancyInput/ContextMetadata.jecs b/CriticalPathAnalyzer/CriticalPathAnalyzer/FancyInput/ContextMetadata.jecs
index 894ad9d..0544baa 100644
--- a/CriticalPathAnalyzer/CriticalPathAnalyzer/FancyInput/ContextMetadata.jecs
+++ b/CriticalPathAnalyzer/CriticalPathAnalyzer/FancyInput/ContextMetadata.jecs
@@ -1,8 +1,11 @@
-CriticalPathAnalyzer.CriticalPathAnalyzer:
+CriticalPathAnalyzer.CriticalPathAnalyzerBuilding:
   InjectTriggersInto:
     - MHG.BuildActions
   Triggers:
     - CriticalPathAnalyzer.OpenPathAnalyzer
+
+CriticalPathAnalyzer.CriticalPathAnalyzerTool:
+  Triggers:
     - CriticalPathAnalyzer.AnalyzePathStart
     - CriticalPathAnalyzer.AnalyzePathEnd
     - CriticalPathAnalyzer.DisplayLoop
diff --git a/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/keybindings/CriticalPathAnalyzerContext.cs b/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/keybindings/CriticalPathAnalyzerContext.cs
index d4a200c..4e149e7 100644
--- a/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/keybindings/CriticalPathAnalyzerContext.cs
+++ b/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/keybindings/CriticalPathAnalyzerContext.cs
@@ -1,5 +1,6 @@
 namespace CriticalPathAnalyzer.Client.Keybindings {
     public enum CriticalPathAnalyzerContext {
-        CriticalPathAnalyzer
+        CriticalPathAnalyzerBuilding,
+        CriticalPathAnalyzerTool,
     }
 }
\ No newline at end of file