diff --git a/src/toolkit/Community.VisualStudio.Toolkit.Shared/Commands/Commands.cs b/src/toolkit/Community.VisualStudio.Toolkit.Shared/Commands/Commands.cs
index a7e3072..b7241b4 100644
--- a/src/toolkit/Community.VisualStudio.Toolkit.Shared/Commands/Commands.cs
+++ b/src/toolkit/Community.VisualStudio.Toolkit.Shared/Commands/Commands.cs
@@ -140,6 +140,11 @@ public CommandInterceptor(CommandID cmd, Func<CommandProgression> func)
 
         public int QueryStatus(ref Guid pguidCmdGroup, uint cCmds, OLECMD[] prgCmds, IntPtr pCmdText)
         {
+            if (prgCmds[0].cmdID == _cmd.ID)
+            {
+                prgCmds[0].cmdf = (uint)OLECMDF.OLECMDF_ENABLED | (uint)OLECMDF.OLECMDF_SUPPORTED;
+                return VSConstants.S_OK;
+            }
             return (int)Microsoft.VisualStudio.OLE.Interop.Constants.OLECMDERR_E_NOTSUPPORTED;
         }