diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/AddTemplateCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/AddTemplateCommand.cs
index bec975a523..bfb20d116a 100644
--- a/Rubberduck.Core/UI/CodeExplorer/Commands/AddTemplateCommand.cs
+++ b/Rubberduck.Core/UI/CodeExplorer/Commands/AddTemplateCommand.cs
@@ -29,7 +29,7 @@ public bool CanExecuteForNode(ICodeExplorerNode model)
         protected override bool EvaluateCanExecute(object parameter)
         {
             // TODO this cast needs to be safer.
-            var data = ((string templateName, CodeExplorerItemViewModel model)) parameter;
+            var data = ((string templateName, ICodeExplorerNode model)) parameter;
 
             return base.EvaluateCanExecute(data.model);
         }
@@ -37,15 +37,15 @@ protected override bool EvaluateCanExecute(object parameter)
         protected override void OnExecute(object parameter)
         {
             // TODO this cast needs to be safer.
-            var data = ((string templateName, CodeExplorerItemViewModel model)) parameter;
+            var data = ((string templateName, ICodeExplorerNode node)) parameter;
 
-            if (string.IsNullOrWhiteSpace(data.templateName))
+            if (string.IsNullOrWhiteSpace(data.templateName) || !(data.node is CodeExplorerItemViewModel model))
             {
                 return;
             }
 
             var moduleText = GetTemplate(data.templateName);
-            AddComponent(data.model, moduleText);
+            AddComponent(model, moduleText);
         }
 
         private string GetTemplate(string name)