diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index 2df999b..fd3b8e7 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -19,7 +19,7 @@
           </div>
           <a href="@context.path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
           <div style="width: 50%;">
-            @gitbucket.core.helper.html.copy("generated-token-copy", tokenString, targetTextId = "generated-token"){
+            @gitbucket.core.helper.html.copy("generated-token", "generated-token-copy", tokenString){
               <input type="text" value="@tokenString" class="form-control input-sm" id="generated-token" readonly>
             }
           </div>
diff --git a/src/main/twirl/gitbucket/core/helper/copy.scala.html b/src/main/twirl/gitbucket/core/helper/copy.scala.html
index b02973c..bdf099e 100644
--- a/src/main/twirl/gitbucket/core/helper/copy.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/copy.scala.html
@@ -1,31 +1,30 @@
-@(id: String, value: String, style: String = "", targetTextId: String = "")(html: Html = Html(""))
+@(targetTextId: String, copyButtonId: String, value: String, style: String = "")(html: Html = Html(""))
 @if(html.body.nonEmpty){
   <div class="input-group" style="margin-bottom: 0px;">
     @html
     <span class="input-group-btn">
-      <span id="@id" class="btn btn-default" @if(style.nonEmpty){style="@style"}
+      <span id="@copyButtonId" class="btn btn-default" @if(style.nonEmpty){style="@style"}
         data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="octicon octicon-clippy"></i></span>
     </span>
   </div>
 } else {
-  <span id="@id" class="btn btn-default" @if(style.nonEmpty){style="@style"}
+  <span id="@copyButtonId" class="btn btn-default" @if(style.nonEmpty){style="@style"}
     data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="octicon octicon-clippy"></i></span>
 }
 <script>
 // copy to clipboard
 (function() {
-  @if(targetTextId.nonEmpty){
   // if document.execCommand('copy') is available, use it for copy.
   if (document.queryCommandSupported('copy')) {
-    var title = $('#@id').attr('title');
-    $('#@id').tooltip({
+    var title = $('#@copyButtonId').attr('title');
+    $('#@copyButtonId').tooltip({
       @* if default container is used then 2 lines tooltip text is displayd because tooptip width is narrow. *@
       container: 'body'
     });
-    $('#@id').on('click', function() {
+    $('#@copyButtonId').on('click', function() {
       var target = document.getElementById('@targetTextId');
       if (!target) { @* target's id is incorrect. Fix argument's value *@
-        $('#@id').attr('title', 'failed to copy').tooltip('fixTitle').tooltip('show');
+        $('#@copyButtonId').attr('title', 'failed to copy').tooltip('fixTitle').tooltip('show');
         return;
       }
       if (typeof target.select === 'function') {
@@ -38,14 +37,12 @@
         selection.addRange(range);
       }
       document.execCommand('copy');
-      $('#@id').attr('title', 'copied!').tooltip('fixTitle').tooltip('show');
-      $('#@id').attr('title', title).tooltip('fixTitle');
+      $('#@copyButtonId').attr('title', 'copied!').tooltip('fixTitle').tooltip('show');
+      $('#@copyButtonId').attr('title', title).tooltip('fixTitle');
     });
-    return
   } else {
     // if copy is not supported, remove the copy button
-    $('#@id').remove();
-  }
+    $('#@copyButtonId').remove();
   }
 })();
 </script>
diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index 2f20b58..7a10072 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -99,7 +99,7 @@
                 you can perform a manual merge on the command line.
               </p>
             }
-            @gitbucket.core.helper.html.copy("repository-url-copy", forkedRepository.httpUrl, targetTextId = "repository-url"){
+            @gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", forkedRepository.httpUrl){
               <div class="input-group-btn" data-toggle="buttons">
                 <label class="btn btn-sm btn-default active" id="repository-url-http"><input type="radio" checked>HTTP</label>
                 @if(context.settings.ssh && context.loginAccount.isDefined){
@@ -114,7 +114,7 @@
               </p>
               @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\n" +
                         s"git pull ${forkedRepository.httpUrl} ${pullreq.requestBranch}"){ command =>
-                @gitbucket.core.helper.html.copy("merge-command-copy-1", command, "position: absolute; right: 31px;", "merge-command")()
+                @gitbucket.core.helper.html.copy("merge-command", "merge-command-copy-1", command, "position: absolute; right: 31px;")()
                 <pre style="font-size: 12px; border-radius: 3px;" id="merge-command">@Html(command)</pre>
               }
             </div>
@@ -124,7 +124,7 @@
               </p>
               @defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\n" +
                         s"git push origin ${pullreq.branch}"){ command =>
-                @gitbucket.core.helper.html.copy("merge-command-copy-2", command, "position: absolute; right: 31px;", "merge-command-2")()
+                @gitbucket.core.helper.html.copy("merge-command-2", "merge-command-copy-2", command, "position: absolute; right: 31px;")()
                 <pre style="font-size: 12px; border-radius: 3px;" id="merge-command-2">@command</pre>
               }
             </div>
diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html
index 171fa4f..d76d5fc 100644
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -39,7 +39,7 @@
         </div>
         <div class="pull-right pc">
           <div style="width: 240px; margin-right: 5px; margin-left: 5px;">
-            @gitbucket.core.helper.html.copy("repository-url-copy", repository.httpUrl, targetTextId = "repository-url"){
+            @gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", repository.httpUrl){
               @if(repository.sshUrl.isDefined){
                 <div class="btn-group input-group-btn">
                   <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html
index ca6a166..f4c0b49 100644
--- a/src/main/twirl/gitbucket/core/wiki/page.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html
@@ -64,7 +64,7 @@
       <div>
         <strong>Clone this wiki locally</strong>
       </div>
-      @gitbucket.core.helper.html.copy("repository-url-copy", WikiService.wikiHttpUrl(repository), targetTextId = "repository-url"){
+      @gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", WikiService.wikiHttpUrl(repository)){
         <input type="text" value="@WikiService.wikiHttpUrl(repository)" id="repository-url" class="form-control input-sm" readonly>
       }
       @if(WikiService.wikiSshUrl(repository).isDefined) {