diff --git a/doc/dev/background-information/graphql_api.md b/doc/dev/background-information/graphql_api.md
index 28164b9faa4..a78e55bce66 100644
--- a/doc/dev/background-information/graphql_api.md
+++ b/doc/dev/background-information/graphql_api.md
@@ -59,3 +59,7 @@ Try to avoid making breaking changes, but if you have to, be sure to give client
 
 - Add a new field with a different name, deprecate the old field, and communicate the deprecation in the changelog
 - Give clients time to migrate (2 release cycles is a common guideline), remove the old deprecated field, and communicate the removal in the changelog
+
+## Guides
+
+- [How to add a GraphQL query](../how-to/add_graphql_query.md)
diff --git a/doc/dev/how-to/add_graphql_query.md b/doc/dev/how-to/add_graphql_query.md
new file mode 100644
index 00000000000..9f51a552300
--- /dev/null
+++ b/doc/dev/how-to/add_graphql_query.md
@@ -0,0 +1,52 @@
+# How to add a GraphQL query
+
+This guide documents how to add a new query to the GraphQL API. It explains what needs to be added to the Go code, as well as how to then use that query in the UI.
+
+## GraphQL backend
+
+Each GraphQL query usually retrieves data from a data store. In the case of Sourcegraph, this is usually Postgres. So there needs to be some mechanism in the backend that does this.
+
+### Query function
+
+The data query functions are split across multiple files depending on their function, which can be found in [cmd/frontend/graphqlbackend](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/cmd/frontend/graphqlbackend). To use an existing function as an example, in [cmd/frontend/graphqlbackend/feature_flags.go](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/cmd/frontend/graphqlbackend/feature_flags.go) you'll find a function named [`OrganizationFeatureFlagValue`](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+file:%5Ecmd/frontend/graphqlbackend/feature_flags%5C.go+OrganizationFeatureFlagValue&patternType=literal) that takes `OrgID` and `FlagName` as arguments and fetches the relevant data from the database.
+
+The `schemaResolver` struct each function is tied to is what allows GraphQL to link the GraphQL query to an actual operation. To create a new GraphQL query, create a function that's tied to the `schemaResolver` struct. It needs to be a public function, so in Go, it has to start with a capital letter. You can use an existing function as a guiding example (find functions by searching for [`schemaResolver`](https://sourcegraph.com/search?q=context:global+repo:github.com/sourcegraph/sourcegraph+schemaResolver&patternType=literal&case=yes)).
+
+```go
+func (r *schemaResolver) NewQuery(ctx context.Context, args *struct {
+  SomeArg string
+}) (bool, error) {
+  // some code that fetches and returns data from the database
+}
+```
+
+The GraphQL schema also needs to know about this new function and what it returns. An example GraphQL schema can be found in [`cmd/frontend/graphqlbackend/schema.graphql`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/cmd/frontend/graphqlbackend/schema.graphql), but this is [not the only GraphQL schema](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+file:.*%5C.graphql%24&patternType=literal) (schema files have the `.graphql` extension). To continue with the `OrganizationFeatureFlagValue` example, you'll find a entry for [`organizationFeatureFlagValue`](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+file:%5Ecmd/frontend/graphqlbackend/schema%5C.graphql+organizationFeatureFlagValue&patternType=literal) in the schema file. The name has to be the exact same as the Go function, except it starts with a lower case letter instead of a capital letter.
+
+```graphql
+newQuery(someArg: String!): Boolean!
+```
+
+## UI
+
+The UI needs to know about the GraphQL query as well. `graphql-operations.ts` files are generated from strings tagged with `gql` in the TypeScript files. These `graphql-operations.ts` files (which are excluded from the repository) are where the TypeScript functions, argument values, and return types are defined.
+
+Searching for [`organizationFeatureFlagValue`](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+file:%5Eclient/web/src/org/backend%5C.ts+organizationFeatureFlagValue&patternType=literal) will reveal a `gql` tagged string in [`client/web/src/org/backend.ts`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/client/web/src/org/backend.ts). You'll see the query is given a name, namely `OrgFeatureFlagValue` along with some parameters that are then used in the actual GraphQL function call. This is what the code generator uses to generate the TypeScript files.
+
+So in order to add a new GraphQL function, simply add another `gql` tagged string with a similar structure. Don't forget that you can search for other [`gql` tagged strings](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+file:%5E*%5C.ts+gql%60&patternType=literal) if you need other references.
+
+```ts
+const USE_NEW_QUERY = gql`
+    query UseNewQuery($someArg: String!) {
+        newQuery(someArg: $someArg)
+    }
+`
+```
+
+`yarn generate` or simply saving while your local instance of Sourcegraph is running will generate new `graphql-operations.ts` files with the appropriate functions and types defined.
+
+You can now use this function in your TypeScript code. As an example of how to do this, you could perhaps look at [this](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+file:%5Eclient/web/src/user/settings/codeHosts/UserAddCodeHostsPage%5C.tsx+GET_ORG_FEATURE_FLAG_VALUE&patternType=literal). Also, refer to [Working with GraphQL](../background-information/web/graphql.md)
+
+## Links
+
+- [Working with GraphQL](../background-information/web/graphql.md)
+- [Developing the Sourcegraph GraphQL API](../background-information/graphql_api.md)
diff --git a/doc/dev/how-to/index.md b/doc/dev/how-to/index.md
index 30f49d70f89..24504cbeb96 100644
--- a/doc/dev/how-to/index.md
+++ b/doc/dev/how-to/index.md
@@ -16,6 +16,8 @@
   - [How to find monitoring](find_monitoring.md)
   - [How to add monitoring](add_monitoring.md)
   - [How to enable continuous profiling in production](profiling_continuous.md)
+- [GraphQL](../background-information/graphql_api.md)
+  - [How to add a GraphQL query](../how-to/add_graphql_query.md)
 
 ## Local Environment