diff --git a/.changeset/chilly-weeks-invent.md b/.changeset/chilly-weeks-invent.md
new file mode 100644
index 00000000000..3b33d85b7b2
--- /dev/null
+++ b/.changeset/chilly-weeks-invent.md
@@ -0,0 +1,5 @@
+---
+'graphiql': patch
+---
+
+Fix styles of secondary editor buttons
diff --git a/packages/graphiql/src/components/GraphiQL.tsx b/packages/graphiql/src/components/GraphiQL.tsx
index 929d0119765..fb68ddb6a26 100644
--- a/packages/graphiql/src/components/GraphiQL.tsx
+++ b/packages/graphiql/src/components/GraphiQL.tsx
@@ -513,7 +513,8 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) {
                         <UnStyledButton
                           type="button"
                           className={
-                            activeSecondaryEditor === 'variables'
+                            activeSecondaryEditor === 'variables' &&
+                            editorToolsResize.hiddenElement !== 'second'
                               ? 'active'
                               : ''
                           }
@@ -530,7 +531,8 @@ export function GraphiQLInterface(props: GraphiQLInterfaceProps) {
                           <UnStyledButton
                             type="button"
                             className={
-                              activeSecondaryEditor === 'headers'
+                              activeSecondaryEditor === 'headers' &&
+                              editorToolsResize.hiddenElement !== 'second'
                                 ? 'active'
                                 : ''
                             }
diff --git a/packages/graphiql/src/style.css b/packages/graphiql/src/style.css
index b1f4cd79c31..758a0e1184b 100644
--- a/packages/graphiql/src/style.css
+++ b/packages/graphiql/src/style.css
@@ -251,12 +251,11 @@ button.graphiql-tab-add > svg {
   width: 0;
 }
 
-/* Generic icon style */
 .graphiql-container .graphiql-chevron-icon {
   color: hsla(var(--color-neutral), var(--alpha-tertiary));
   display: block;
   height: var(--px-12);
-  padding: var(--px-12);
+  margin: var(--px-12);
   width: var(--px-12);
 }