diff --git a/actions-languageservice/src/context-providers/github.ts b/actions-languageservice/src/context-providers/github.ts
index 2d6f5a5..10a8ec9 100644
--- a/actions-languageservice/src/context-providers/github.ts
+++ b/actions-languageservice/src/context-providers/github.ts
@@ -76,6 +76,7 @@ function getEventContext(workflowContext: WorkflowContext, mode: Mode): Expressi
 
   // For callable workflows, the event is inherited from the calling workflow
   // Allow any value for this case
+  // This includes github.event.inputs, which is only available via the inputs context
   if (eventsConfig.workflow_call && mode == Mode.Validation) {
     return new data.Null();
   }
diff --git a/actions-languageservice/src/validate.expressions.test.ts b/actions-languageservice/src/validate.expressions.test.ts
index ce58ee7..df2b245 100644
--- a/actions-languageservice/src/validate.expressions.test.ts
+++ b/actions-languageservice/src/validate.expressions.test.ts
@@ -1164,7 +1164,45 @@ jobs:
       ]);
     });
 
-    it("validates event inputs", async () => {
+    it("validates event inputs via github.event", async () => {
+      const input = `
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        type: string
+        default: some value
+      another-name:
+        type: string
+jobs:
+  a:
+    runs-on: ubuntu-latest
+    steps:
+    - run: echo "hello \${{ github.event.inputs.name }}"
+    - run: echo "hello \${{ github.event.inputs.another-name }}"
+    - run: echo "hello \${{ github.event.inputs.random }}"
+`;
+      const result = await validate(createDocument("wf.yaml", input));
+
+      expect(result).toEqual([
+        {
+          message: "Context access might be invalid: random",
+          range: {
+            start: {
+              character: 23,
+              line: 15
+            },
+            end: {
+              character: 56,
+              line: 15
+            }
+          },
+          severity: 2
+        }
+      ]);
+    });
+
+    it("validates event inputs via inputs context", async () => {
       const input = `
 on:
   workflow_dispatch:
@@ -1182,9 +1220,6 @@ jobs:
   a:
     runs-on: ubuntu-latest
     steps:
-    - run: echo "hello \${{ github.event.inputs.name }}"
-    - run: echo "hello \${{ github.event.inputs.third-name }}"
-    - run: echo "hello \${{ github.event.inputs.random }}"
     - run: echo \${{ fromJSON(inputs.random2) }}
     - run: echo "hello \${{ inputs.random }}"
       name: "\${{ fromJSON('test') == inputs.name }}"
@@ -1192,47 +1227,33 @@ jobs:
       const result = await validate(createDocument("wf.yaml", input));
 
       expect(result).toEqual([
+        {
+          message: "Context access might be invalid: random2",
+          range: {
+            start: {
+              character: 16,
+              line: 17
+            },
+            end: {
+              character: 47,
+              line: 17
+            }
+          },
+          severity: 2
+        },
         {
           message: "Context access might be invalid: random",
           range: {
-            end: {
-              character: 56,
-              line: 19
-            },
             start: {
               character: 23,
-              line: 19
+              line: 18
+            },
+            end: {
+              character: 43,
+              line: 18
             }
           },
           severity: DiagnosticSeverity.Warning
-        },
-        {
-          message: "Context access might be invalid: random2",
-          range: {
-            end: {
-              character: 47,
-              line: 20
-            },
-            start: {
-              character: 16,
-              line: 20
-            }
-          },
-          severity: 2
-        },
-        {
-          message: "Context access might be invalid: random",
-          range: {
-            end: {
-              character: 43,
-              line: 21
-            },
-            start: {
-              character: 23,
-              line: 21
-            }
-          },
-          severity: 2
         }
       ]);
     });