diff --git a/frontend/src/app/main/ui/viewer/inspect/code.cljs b/frontend/src/app/main/ui/viewer/inspect/code.cljs
index 205ff04f3..03afee4ac 100644
--- a/frontend/src/app/main/ui/viewer/inspect/code.cljs
+++ b/frontend/src/app/main/ui/viewer/inspect/code.cljs
@@ -240,7 +240,8 @@
         [:button.download-button {:on-click handle-open-review}
          "Preview"]]
 
-     [:div {:class (stl/css :code-block)}
+     [:div {:class (stl/css-case :code-block true
+                                 :collapsed collapsed-css?)}
       [:div {:class (stl/css :code-row-lang)}
        [:button {:class (stl/css :toggle-btn)
                  :data-type "css"
@@ -274,7 +275,8 @@
              :on-lost-pointer-capture on-style-lost-pointer-capture
              :on-pointer-move on-style-pointer-move}]]
 
-     [:div {:class (stl/css :code-block)}
+     [:div {:class (stl/css-case :code-block true
+                                 :collapsed collapsed-markup?)}
       [:div {:class (stl/css :code-row-lang)}
        [:button {:class (stl/css :toggle-btn)
                  :data-type "markup"
diff --git a/frontend/src/app/main/ui/viewer/inspect/code.scss b/frontend/src/app/main/ui/viewer/inspect/code.scss
index 9f7c37b5e..1e1e58666 100644
--- a/frontend/src/app/main/ui/viewer/inspect/code.scss
+++ b/frontend/src/app/main/ui/viewer/inspect/code.scss
@@ -26,7 +26,6 @@
   @include codeTypography;
   display: flex;
   flex-direction: column;
-  flex: 1;
   height: 100%;
   min-height: 0;
   overflow: hidden;
@@ -35,7 +34,6 @@
   pre {
     border-radius: $br-8;
     padding: $s-16;
-    max-height: var(--code-height);
     overflow: auto;
     height: 100%;
   }
@@ -44,6 +42,10 @@
   :global(.hljs) {
     background: $db-tertiary;
   }
+
+  &.collapsed {
+    height: initial;
+  }
 }
 
 .code-row-lang {
diff --git a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.scss b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.scss
index c5267edbf..3074e676a 100644
--- a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.scss
+++ b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.scss
@@ -16,6 +16,7 @@
   grid-area: right-sidebar;
   padding-top: $s-8;
   padding-left: $s-12;
+  overflow: hidden;
   &.viewer-code {
     height: calc(100vh - $s-48);
   }