diff --git a/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/LanguageServer.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/LanguageServer.hs
index 80b12e7ed5..e5b2aab4c1 100644
--- a/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/LanguageServer.hs
+++ b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/LanguageServer.hs
@@ -171,6 +171,9 @@ getSpanAndTypeAtHole amapping range hf = do
         let info = nodeInfo ast'
         ty <- listToMaybe $ nodeType info
         guard $ ("HsUnboundVar","HsExpr") `S.member` nodeAnnotations info
+        -- Ensure we're actually looking at a hole here
+        guard $ all (either (const False) $ isHole . occName)
+          $ M.keysSet $ nodeIdentifiers info
         pure (nodeSpan ast', ty)
 
 
diff --git a/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/LanguageServer/TacticProviders.hs b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/LanguageServer/TacticProviders.hs
index de4e3c66ee..345d14c891 100644
--- a/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/LanguageServer/TacticProviders.hs
+++ b/plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/LanguageServer/TacticProviders.hs
@@ -54,6 +54,40 @@ commandTactic UseDataCon             = userSplit
 commandTactic Refine                 = const refine
 
 
+------------------------------------------------------------------------------
+-- | The LSP kind
+tacticKind :: TacticCommand -> T.Text
+tacticKind Auto                   = "fillHole"
+tacticKind Intros                 = "introduceLambda"
+tacticKind Destruct               = "caseSplit"
+tacticKind Homomorphism           = "homomorphicCaseSplit"
+tacticKind DestructLambdaCase     = "lambdaCase"
+tacticKind HomomorphismLambdaCase = "homomorphicLambdaCase"
+tacticKind DestructAll            = "splitFuncArgs"
+tacticKind UseDataCon             = "useConstructor"
+tacticKind Refine                 = "refine"
+
+
+------------------------------------------------------------------------------
+-- | Whether or not this code action is preferred -- ostensibly refers to
+-- whether or not we can bind it to a key in vs code?
+tacticPreferred :: TacticCommand -> Bool
+tacticPreferred Auto                   = True
+tacticPreferred Intros                 = True
+tacticPreferred Destruct               = True
+tacticPreferred Homomorphism           = False
+tacticPreferred DestructLambdaCase     = False
+tacticPreferred HomomorphismLambdaCase = False
+tacticPreferred DestructAll            = True
+tacticPreferred UseDataCon             = True
+tacticPreferred Refine                 = True
+
+
+mkTacticKind :: TacticCommand -> CodeActionKind
+mkTacticKind =
+  CodeActionUnknown . mappend "refactor.wingman." . tacticKind
+
+
 ------------------------------------------------------------------------------
 -- | Mapping from tactic commands to their contextual providers. See 'provide',
 -- 'filterGoalType' and 'filterBindingType' for the nitty gritty.
@@ -225,7 +259,13 @@ provide tc name _ _ plId uri range _ = do
   pure
     $ pure
     $ InR
-    $ CodeAction title (Just CodeActionQuickFix) Nothing Nothing Nothing Nothing
+    $ CodeAction
+        title
+        (Just $ mkTacticKind tc)
+        Nothing
+        (Just $ tacticPreferred tc)
+        Nothing
+        Nothing
     $ Just cmd