diff --git a/CHANGELOG.md b/CHANGELOG.md
index 044113a..6c1b9e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Changelog of Pull Request Notifier for Bitbucket.
 
+## Unreleased
+### No issue
+  doc
+  
+  [cb3f1d638bcf213](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/cb3f1d638bcf213) Tomas Bjerre *2017-03-07 16:03:09*
+
 ## 2.59
 ### GitHub [#197](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/197) Button not displaying on PRs which are merged
   Another attempt on fixing button issue 
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index f6f8df2..b65cc3d 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -57,7 +57,7 @@
 
  <client-web-item key="se.bjurr.prnfb.triggerbutton" name="Trigger Notification" weight="50" section="bitbucket.pullrequest.action">
   <dependency>${project.groupId}-${project.artifactId}:pr-triggerbutton</dependency>
-  <label key="bitbucket.web.pull-request.toolbar.triggerbutton"></label>
+  <label key="bitbucket.web.pull-request.toolbar.triggerbutton">pr-triggerbutton</label>
  </client-web-item>
 
  <web-resource key="pr-triggerbutton">
diff --git a/src/main/resources/pr-triggerbutton.js b/src/main/resources/pr-triggerbutton.js
index 267dee7..76fce35 100644
--- a/src/main/resources/pr-triggerbutton.js
+++ b/src/main/resources/pr-triggerbutton.js
@@ -10,7 +10,8 @@ define('plugin/prnfb/pr-triggerbutton', [
  var waiting = '<span class="aui-icon aui-icon-wait aui-icon-small">Wait</span>';
  var $buttonArea = $('#pull-request-header-more').find('.aui-button').first().closest('ul');
  $buttonArea.find('.aui-button').each(function(index, auiButton) {
-  if ($(auiButton).text().trim() === '') {
+  var buttonText = $(auiButton).text().trim();
+  if (buttonText === '' || buttonText === 'pr-triggerbutton') {
    //An empty button is added by 'client-web-item' in atlassian-plugin.xml
    auiButton.remove();
   }