diff --git a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
index ea62c3111b..e701734dc6 100644
--- a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
+++ b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
@@ -109,7 +109,9 @@
             [:span {:class (stl/css :layer-title)} (:name first-shape)]])]
         [:div {:class (stl/css :inspect-content)}
          [:& tab-container {:on-change-tab handle-change-tab
-                            :selected @section}
+                            :selected @section
+                            :content-class (stl/css :tab-content)
+                            :header-class (stl/css :tab-header)}
           [:& tab-element {:id :info :title (tr "inspect.tabs.info")}
            [:& attributes {:page-id page-id
                            :objects objects
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 1c58444d38..bb4fffe8b7 100644
--- a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.scss
+++ b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.scss
@@ -96,3 +96,11 @@
   flex: 1;
   overflow: hidden;
 }
+
+.tab-content {
+  scrollbar-gutter: stable;
+}
+
+.tab-header {
+  margin-right: $s-12;
+}
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options.cljs b/frontend/src/app/main/ui/workspace/sidebar/options.cljs
index ce83d7fa9b..0a950b453e 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options.cljs
@@ -104,7 +104,7 @@
       {:on-change-tab on-change-tab
        :selected section
        :collapsable false
-       :content-class (stl/css :content-class)
+       :content-class (stl/css-case :content-class true :inspect (= section :inspect))
        :header-class (stl/css :tab-spacing)}
       [:& tab-element {:id :design
                        :title (tr "workspace.options.design")}
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options.scss b/frontend/src/app/main/ui/workspace/sidebar/options.scss
index 3fc519cef3..80a1229947 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options.scss
@@ -34,3 +34,7 @@
   gap: $s-8;
   padding-top: $s-8;
 }
+
+.inspect {
+  scrollbar-gutter: unset;
+}