diff --git a/module/risk/control.php b/module/risk/control.php
index fbe36e9828..e3e0477aaa 100644
--- a/module/risk/control.php
+++ b/module/risk/control.php
@@ -229,7 +229,7 @@ class risk extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
+            if(isonlybody()) $this->send(array('locate' => 'parent', 'message' => $this->lang->saveSuccess, 'result' => 'success'));
             $this->send(array('locate' => inlink('browse')));
         }
 
diff --git a/module/risk/view/browse.html.php b/module/risk/view/browse.html.php
index 425f74cd14..860fb04af1 100644
--- a/module/risk/view/browse.html.php
+++ b/module/risk/view/browse.html.php
@@ -74,7 +74,7 @@
         <td class='c-actions'>
           <?php
           $params = "riskID=$risk->id";
-          common::printIcon('risk', 'track', $params, $risk, "list", 'checked');
+          common::printIcon('risk', 'track', $params, $risk, "list", 'checked', '', 'iframe', true);
           common::printIcon('risk', 'close', $params, $risk, "list", '', '', 'iframe', true);
           common::printIcon('risk', 'cancel', $params, $risk, "list", '', '', 'iframe', true);
           common::printIcon('risk', 'hangup', $params, $risk, "list", 'arrow-up', '', 'iframe', true);
diff --git a/module/risk/view/track.html.php b/module/risk/view/track.html.php
index 4ea1c02f6a..2fd5269e1b 100644
--- a/module/risk/view/track.html.php
+++ b/module/risk/view/track.html.php
@@ -24,7 +24,6 @@
             <th><?php echo $lang->risk->isChange;?></th>
             <td><?php echo html::radio('isChange', $lang->risk->isChangeList, 0, "onclick=refreshPage(this)");?></td>
             <td></td>
-            <td></td>
           </tr>
           <tr class='track hidden'>
             <th><?php echo $lang->risk->name;?></th>
diff --git a/module/risk/view/view.html.php b/module/risk/view/view.html.php
index 0d9741c37b..0ba0b46598 100644
--- a/module/risk/view/view.html.php
+++ b/module/risk/view/view.html.php
@@ -52,7 +52,7 @@
         <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
         <?php if(!$risk->deleted):?>
         <?php
-        common::printIcon('risk', 'track', "riskID=$risk->id", $risk, 'button', 'checked', '', 'showinonlybody');
+        common::printIcon('risk', 'track', "riskID=$risk->id", $risk, "button", 'checked', '', 'iframe showinonlybody', true);
         common::printIcon('risk', 'assignTo', "riskID=$risk->id", $risk, 'button', '', '', 'iframe showinonlybody', true);
         common::printIcon('risk', 'cancel', "riskID=$risk->id", $risk, 'button', '', '', 'iframe showinonlybody', true);
         common::printIcon('risk', 'close',    "riskID=$risk->id", $risk, 'button', '', '', 'iframe showinonlybody', true);