diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index 1417b92a48..9afc25397b 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -571,7 +571,7 @@ detailBody
                         set::items(isset($bug->relatedBugTitles) ? $bug->relatedBugTitles : array()),
                         set::value($bug->relatedBug)
                     ),
-                    common::hasPriv('bug', 'linkBugs') ? inputGroupAddon
+                    common::hasPriv('bug', 'linkBugs') && !isInModal() ? inputGroupAddon
                     (
                         setClass('p-0'),
                         btn
diff --git a/module/execution/js/taskkanban.ui.js b/module/execution/js/taskkanban.ui.js
index 59514a2f3f..e4b1b13423 100644
--- a/module/execution/js/taskkanban.ui.js
+++ b/module/execution/js/taskkanban.ui.js
@@ -149,7 +149,7 @@ window.buildColCardActions = function(col)
     }
     else if(col.type == 'unconfirmed')
     {
-        if(priv.canCreateBug) actions.push({text: bugLang.create, url: $.createLink('bug', 'create', 'productID=0&moduleID=0&extra=executionID=' + executionID), 'data-toggle': 'modal', 'data-size': 'lg'});
+        if(priv.canCreateBug) actions.push({text: bugLang.create, url: $.createLink('bug', 'create', 'productID=' + productID + '&moduleID=0&extra=executionID=' + executionID), 'data-toggle': 'modal', 'data-size': 'lg'});
         if(priv.canBatchCreateBug)
         {
             if(productNum > 1) actions.push({text: bugLang.batchCreate, url: '#batchCreateBug', 'data-toggle': 'modal', 'data-size': 'lg'});