diff --git a/platform/commonUI/browse/res/templates/browse/object-properties.html b/platform/commonUI/browse/res/templates/browse/object-properties.html
index 149da6b874..8a837160c6 100644
--- a/platform/commonUI/browse/res/templates/browse/object-properties.html
+++ b/platform/commonUI/browse/res/templates/browse/object-properties.html
@@ -20,8 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <div ng-controller="ObjectInspectorController as controller">
-    <div class="pane-header flex-elem">Inspection</div>
-    <ul class="flex-elem grows vscroll">
+    <ul class="flex-elem grows l-inspector-part">
         <li>
             <em>Properties</em>
             <div class="inspector-properties"
diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss
index f1420da094..75013dd185 100644
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -57,7 +57,7 @@
         }
     }
     
-    ul {
+    .l-inspector-part {
         @include box-sizing(border-box);
         padding-right: $interiorMargin;
     }
diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html
index 8b13d841c5..813f244b47 100644
--- a/platform/commonUI/general/res/templates/object-inspector.html
+++ b/platform/commonUI/general/res/templates/object-inspector.html
@@ -22,12 +22,14 @@
 <span class="l-inspect">
     <div ng-controller="PaneController as modelPaneEdit">
         <mct-split-pane class='abs contents split-layout' anchor='bottom'>
-            <div class="split-pane-component pane top" style="overflow-y:auto;">
+            <div class="split-pane-component pane top">
                 <div class="abs holder holder-inspector l-flex-col">
+                    <div class="pane-header flex-elem">Inspection</div>
                     <mct-representation
                             key="'inspector-region'"
                             mct-object="domainObject"
-                            ng-model="ngModel">
+                            ng-model="ngModel"
+                            class="flex-elem grows vscroll l-flex-col">
                     </mct-representation>
                 </div><!--/ holder-inspector -->
             </div><!--/ split-pane-component -->
diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css
index b936d7992e..442815713f 100644
--- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css
+++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css
@@ -1486,7 +1486,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before {
     min-height: 20%;
     max-height: 80%; }
   /* line 60, ../../../../general/res/sass/_inspector.scss */
-  .l-inspect ul {
+  .l-inspect .l-inspector-part {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css
index d9f35d4afe..1df8fd1c07 100644
--- a/platform/commonUI/themes/snow/res/css/theme-snow.css
+++ b/platform/commonUI/themes/snow/res/css/theme-snow.css
@@ -1467,7 +1467,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before {
     min-height: 20%;
     max-height: 80%; }
   /* line 60, ../../../../general/res/sass/_inspector.scss */
-  .l-inspect ul {
+  .l-inspect .l-inspector-part {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
diff --git a/platform/features/layout/res/templates/plot-options-browse.html b/platform/features/layout/res/templates/plot-options-browse.html
index a02f7926af..82ed27622a 100644
--- a/platform/features/layout/res/templates/plot-options-browse.html
+++ b/platform/features/layout/res/templates/plot-options-browse.html
@@ -1,4 +1,4 @@
-<style>
+<!--<style>
     .l-inspect .inspector-plot-options .plot-options-form .label {
         text-transform: none;
     }
@@ -19,9 +19,9 @@
     .l-inspect .inspector-plot-options .plot-options-form .form .form-row.first {
         border-bottom: 1px solid rgba(255, 255, 255, 0.1);
     }
+</style>-->
 
-</style>
-<div ng-controller="PlotOptionsController" class="inspector-plot-options">
+<div ng-controller="PlotOptionsController" class="flex-elem grows l-inspector-part">
     <em>Display</em>
     <ul class="first flex-elem grows vscroll">
         <ul class="tree">