diff --git a/lib/views/file-patch-view.js b/lib/views/file-patch-view.js
index b041c912b5..968972acf4 100644
--- a/lib/views/file-patch-view.js
+++ b/lib/views/file-patch-view.js
@@ -54,6 +54,7 @@ export default class FilePatchView {
     const selectedLines = this.selection.getSelectedLines()
     const headHunk = this.selection.getHeadHunk()
     const headLine = this.selection.getHeadLine()
+    const hunkSelectionMode = this.selection.getMode() === 'hunk'
     const stageButtonLabelPrefix = this.props.stagingStatus === 'unstaged' ? 'Stage' : 'Unstage'
     return (
       <div className='git-FilePatchView' tabIndex='-1'
@@ -62,12 +63,13 @@ export default class FilePatchView {
           const isSelected = selectedHunks.has(hunk)
           const stageButtonLabel =
             stageButtonLabelPrefix +
-              ((this.selection.getMode() === 'hunk' || !isSelected) ? ' Hunk' : ' Selection')
+              ((hunkSelectionMode || !isSelected) ? ' Hunk' : ' Selection')
 
           return (
             <HunkView
               hunk={hunk}
               isSelected={selectedHunks.has(hunk)}
+              hunkSelectionMode={hunkSelectionMode}
               stageButtonLabel={stageButtonLabel}
               selectedLines={selectedLines}
               headLine={headLine}
diff --git a/lib/views/hunk-view.js b/lib/views/hunk-view.js
index 19b449431b..067a81117b 100644
--- a/lib/views/hunk-view.js
+++ b/lib/views/hunk-view.js
@@ -38,8 +38,9 @@ export default class HunkView {
 
   render () {
     const hunkSelectedClass = this.props.isSelected ? 'is-selected' : ''
+    const hunkModeClass = this.props.hunkSelectionMode ? 'is-hunkMode' : ''
     return (
-      <div className={`git-HunkView ${hunkSelectedClass}`}>
+      <div className={`git-HunkView ${hunkModeClass} ${hunkSelectedClass}`}>
         <div className='git-HunkView-header'
              onmousedown={() => this.props.mousedownOnHeader()}>
           <span ref='header' className='git-HunkView-title'>{this.props.hunk.getHeader()}</span>
diff --git a/styles/hunk-view.less b/styles/hunk-view.less
index 124fb2a162..41ae5f39f8 100644
--- a/styles/hunk-view.less
+++ b/styles/hunk-view.less
@@ -68,6 +68,16 @@
 // States
 // -------------------------------
 
+// Highlight hunk title
+.git-HunkView {
+  &.is-selected.is-hunkMode &-title {
+    color: @text-color-selected;
+  }
+  &-title:hover {
+    color: @text-color-highlight;
+  }
+}
+
 .git-HunkView-line {
 
   &.is-selected .git-HunkView-lineNumber {