diff --git a/styles/git-panel.less b/styles/git-panel.less
index d9f75e2d35..fc41ecd5ea 100644
--- a/styles/git-panel.less
+++ b/styles/git-panel.less
@@ -1,19 +1,19 @@
 @import "variables";
 
 .github-PanelEtchWrapper {
-  height: 100%;
+  flex: 1;
+  display: flex;
+  min-width: 0;
 }
 
 .github-Panel {
   flex: 1;
   display: flex;
   flex-direction: column;
-  height: 100%;
   min-width: 0;
   font-family: @font-family;
   font-size: @font-size;
   color: @text-color;
-
   -webkit-user-select: none;
   cursor: default;
 
diff --git a/styles/staging-view.less b/styles/staging-view.less
index 5ced62f069..1b90a2dfcf 100644
--- a/styles/staging-view.less
+++ b/styles/staging-view.less
@@ -16,9 +16,6 @@
     align-items: center;
     padding: 0 0 0 @component-padding;
     font-weight: 600;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
     border-top: 1px solid @panel-heading-border-color;
     border-bottom: 1px solid @panel-heading-border-color;
 
@@ -61,6 +58,9 @@
     flex: 1;
     margin-right: @component-padding;
     line-height: 2.5em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 
   &-list {