diff --git a/assets/js/src/tooltip.js b/assets/js/src/tooltip.js
index 50707cda64..6e66dc6f4e 100644
--- a/assets/js/src/tooltip.js
+++ b/assets/js/src/tooltip.js
@@ -1,4 +1,25 @@
-const cmds = document.querySelectorAll(".language-dockerfile span.k");
+const keywords = [
+  "ADD",
+  "ARG",
+  "CMD",
+  "COPY",
+  "ENTRYPOINT",
+  "ENV",
+  "EXPOSE",
+  "FROM",
+  "HEALTHCHECK",
+  "LABEL",
+  // "MAINTAINER",
+  "ONBUILD",
+  "RUN",
+  "SHELL",
+  "STOPSIGNAL",
+  "USER",
+  "VOLUME",
+  "WORKDIR",
+]
+const cmds = Array.from(document.querySelectorAll(".language-dockerfile span.k"))
+  .filter((el) => keywords.some(kwd => el.textContent.includes(kwd)));
 
 for (const cmd of cmds) {
   const name = cmd.textContent;