diff --git a/src/components/GraphiQL/styles.ts b/src/components/GraphiQL/styles.ts
index 0a4b3cb54..c2e8cacc8 100644
--- a/src/components/GraphiQL/styles.ts
+++ b/src/components/GraphiQL/styles.ts
@@ -3,8 +3,8 @@ import {
   usePluginContext,
   useTheme as useGraphiQLTheme,
 } from "@graphiql/react";
-import { makeStyles, useTheme } from "@saleor/macaw-ui";
-import { vars } from "@saleor/macaw-ui/next";
+import { makeStyles } from "@saleor/macaw-ui";
+import { useTheme, vars } from "@saleor/macaw-ui/next";
 import { useEffect } from "react";
 
 export const useStyles = makeStyles(
@@ -55,6 +55,14 @@ export const useEditorStyles = () => {
 };
 
 export const useDashboardTheme = () => {
+  const {
+    themeValues: {
+      colors: { background },
+    },
+  } = useTheme();
+
+  const match = background.plain.match(/hsla\(([^)]+)\)/);
+
   const rootStyle = {
     "--font-size-body": vars.fontSize.bodyMedium,
     "--font-size-h2": vars.fontSize.headingLarge,
@@ -63,6 +71,7 @@ export const useDashboardTheme = () => {
     "--font-weight-regular": vars.fontWeight.bodyLarge,
     "--font-size-hint": vars.fontSize.bodyEmpLarge,
     "--font-size-inline-code": vars.fontSize.bodySmall,
+    "--color-base": match ? match[1] : background.plain,
   } as React.CSSProperties;
 
   return { rootStyle };
@@ -70,12 +79,9 @@ export const useDashboardTheme = () => {
 
 export const useGraphiQLThemeSwitcher = () => {
   const theme = useTheme();
-  const { theme: graphiqlTheme, setTheme: setGraphiqlTheme } =
-    useGraphiQLTheme();
+  const { setTheme: setGraphiQLTheme } = useGraphiQLTheme();
 
   useEffect(() => {
-    if (theme.themeType !== graphiqlTheme) {
-      setGraphiqlTheme(theme.themeType);
-    }
+    setGraphiQLTheme(theme.theme === "defaultDark" ? "dark" : "light");
   });
 };
diff --git a/src/custom-apps/components/WebhookSubscriptionQuery/WebhookSubscriptionQuery.test.tsx b/src/custom-apps/components/WebhookSubscriptionQuery/WebhookSubscriptionQuery.test.tsx
index d6c98c893..a678c8cad 100644
--- a/src/custom-apps/components/WebhookSubscriptionQuery/WebhookSubscriptionQuery.test.tsx
+++ b/src/custom-apps/components/WebhookSubscriptionQuery/WebhookSubscriptionQuery.test.tsx
@@ -1,10 +1,9 @@
-import "@testing-library/jest-dom";
-
 import {
   WebhookEventTypeAsyncEnum,
   WebhookEventTypeSyncEnum,
 } from "@dashboard/graphql";
 import { Fetcher } from "@graphiql/toolkit";
+import { ThemeProvider } from "@saleor/macaw-ui/next";
 import { ApolloMockedProvider } from "@test/ApolloMockedProvider";
 import { render, screen } from "@testing-library/react";
 import React from "react";
@@ -23,13 +22,6 @@ jest.mock("react-intl", () => ({
   defineMessages: jest.fn(x => x),
 }));
 
-jest.mock("@saleor/macaw-ui", () => ({
-  useTheme: jest.fn(() => () => ({})),
-  useStyles: jest.fn(() => () => ({})),
-  makeStyles: jest.fn(() => () => ({})),
-  DialogHeader: jest.fn(() => () => <></>),
-}));
-
 beforeEach(() => {
   window.localStorage.clear();
 });
@@ -54,7 +46,9 @@ describe("WebhookSubscriptionQuery", () => {
     // Act
     render(
       <ApolloMockedProvider>
-        <WebhookSubscriptionQuery {...props} />
+        <ThemeProvider>
+          <WebhookSubscriptionQuery {...props} />
+        </ThemeProvider>
       </ApolloMockedProvider>,
     );