diff --git a/lib/collapse_diff.js b/lib/collapse_diff.js
index b26b627..2afdac3 100644
--- a/lib/collapse_diff.js
+++ b/lib/collapse_diff.js
@@ -1,10 +1,12 @@
 (function() {
 
-  var butHtml = '<a href="#collapse_diff" style="margin-left: 5px" class="diff-collapse-button btn btn-sm" rel="nofollow">Collapse</a>';
+  var butHtml = '<a href="#collapse_diff" style="margin-left: 5px" class="diff-collapse-button btn btn-sm tooltipped tooltipped-nw" rel="nofollow" aria-label="Collapse the file diff">Collapse</a>';
   var collapsedHtml = '<div class="image diff-collapsed-message" style="display: none"><a href="#" class="expand-diff-link">Diff suppressed. Click to show.</a></div>';
 
   var expand = function(button, content, message) {
     button.textContent = 'Collapse';
+    button.setAttribute('aria-label', 'Collapse the file diff')
+    button.blur()
     content.style.display = ''; // Restore original display (table/block)
     if(message) { message.style.display = 'none'; }
 
@@ -12,15 +14,20 @@
 
   var collapse = function(button, content, message) {
     button.textContent = 'Expand';
+    button.setAttribute('aria-label', 'Expand the file diff')
+    button.blur()
     content.style.display = 'none';
     if(message) { message.style.display = 'block'; }
   };
 
   var bindToggler = function(buttonContainer, tableToToggle, addPlaceHolder) {
     var messageDiv, button;
-    if(!tableToToggle) { return; }
+    if(!tableToToggle || !buttonContainer) { return; }
 
-    buttonContainer.insertAdjacentHTML('afterbegin', butHtml);
+    showFileNotes = buttonContainer.querySelector('.show-file-notes');
+    if(!showFileNotes) { return; }
+
+    showFileNotes.insertAdjacentHTML('afterend', butHtml);
     tableToToggle.insertAdjacentHTML('afterend', collapsedHtml);
     button = buttonContainer.querySelector('.diff-collapse-button');