diff --git a/.changeset/rude-students-destroy.md b/.changeset/rude-students-destroy.md
new file mode 100644
index 000000000..b56e5e2fa
--- /dev/null
+++ b/.changeset/rude-students-destroy.md
@@ -0,0 +1,5 @@
+---
+"apollo-client-devtools": patch
+---
+
+Fix scrolling bug introduced when making sidebar expandable.
diff --git a/src/application/components/Layouts/SidebarLayout.tsx b/src/application/components/Layouts/SidebarLayout.tsx
index 12e2913f1..0eee5d51d 100644
--- a/src/application/components/Layouts/SidebarLayout.tsx
+++ b/src/application/components/Layouts/SidebarLayout.tsx
@@ -59,6 +59,7 @@ const Sidebar = ({ navigationProps, children }: SidebarProps) => {
         defaultSize={25}
         minSize={10}
         style={{
+          overflow: "scroll",
           height: "100vh",
           backgroundColor: "var(--primary)",
         }}
@@ -91,6 +92,7 @@ const Content = ({ children }: ContentProps) => (
     minSize={30}
     data-testid="content"
     style={{
+      overflow: "scroll",
       height: "100vh",
       width: "100%",
       backgroundColor: "var(--main)",
diff --git a/src/extension/devtools/panel.html b/src/extension/devtools/panel.html
index 9294300db..4e01e129d 100755
--- a/src/extension/devtools/panel.html
+++ b/src/extension/devtools/panel.html
@@ -8,6 +8,9 @@
       body {
         overflow: hidden;
       }
+      ::-webkit-scrollbar {
+        display: none;
+      }
       #devtools {
         width: 100vw;
         height: 100vh;