diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_component.css b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_component.css
index eaaef88bc74..9fa3a2654e0 100644
--- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_component.css
+++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_component.css
@@ -14,6 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 .bottom-section {
+  box-sizing: border-box;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
   height: 34%;
   padding-top: 6px;
@@ -21,13 +22,17 @@ limitations under the License.
 }
 
 .debugger-container {
+  box-sizing: border-box;
   background-color: #fff;
   height: 100%;
+  overflow: hidden;
 }
 
 .top-section {
+  box-sizing: border-box;
   height: 66%;
   padding: 6px 0;
+  white-space: nowrap;
   width: 100%;
 }
 
@@ -56,6 +61,7 @@ tf-debugger-v2-source-files {
 
 tf-debugger-v2-stack-trace {
   display: inline-block;
+  height: 100%;
   width: 30%;
 }
 
diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_component.css b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_component.css
index 9fd247f571f..8f9006ae25f 100644
--- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_component.css
+++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_component.css
@@ -42,9 +42,10 @@ limitations under the License.
 }
 
 .stack-frame-array {
-  height: 300px;
   overflow-x: hidden;
   overflow-y: auto;
+  /* Minus padding-left of the parent (stack-trace-container). */
+  width: calc(100% - 8px);
 }
 
 .stack-frame-container {
@@ -87,8 +88,9 @@ limitations under the License.
 
 .stack-trace-container {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
-  display: flexbox;
-  flex-direction: column;
+  box-sizing: border-box;
+  display: flex;
+  flex-flow: column;
   font-size: 10px;
   font-family: 'Roboto Mono', monospace;
   height: 100%;