diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js
index cc4205f8ef..c6a5b337d2 100644
--- a/lib/views/staging-view.js
+++ b/lib/views/staging-view.js
@@ -382,9 +382,9 @@ export default class StagingView {
           <header className="github-StagingView-header">
             <span className="icon icon-list-unordered" />
             <span className="github-StagingView-title">Unstaged Changes</span>
-            {this.props.hasUndoHistory ? this.renderUndoButton() : null}
             {this.props.unstagedChanges.length ? this.renderStageAllButton() : null}
           </header>
+          {this.props.hasUndoHistory ? this.renderUndoButton() : null}
 
           <div ref="unstagedChanges" className="github-StagingView-list github-FilePatchListView" tabIndex="-1">
             {
@@ -512,7 +512,7 @@ export default class StagingView {
 
   renderUndoButton() {
     return (
-      <button className="github-StagingView-headerButton icon icon-history"
+      <button className="github-StagingView-headerButton github-StagingView-headerButton--fullWidth icon icon-history"
         onclick={this.undoLastDiscard}>Undo Discard</button>
     );
   }
diff --git a/styles/staging-view.less b/styles/staging-view.less
index 8df004f7a9..69b61b5bc7 100644
--- a/styles/staging-view.less
+++ b/styles/staging-view.less
@@ -39,6 +39,7 @@
     padding: 0 @component-padding;
     font-weight: normal;
     border-left: 1px solid @panel-heading-border-color;
+    white-space: nowrap;
     background: none;
     cursor: default;
 
@@ -55,6 +56,11 @@
       font-size: 1em;
       text-align: left;
     }
+
+    &--fullWidth {
+      border-left: none;
+      border-bottom: 1px solid @panel-heading-border-color;
+    }
   }